diff --git a/Dialogs.aps b/Dialogs.aps index f9d2af7..0df5e20 100644 Binary files a/Dialogs.aps and b/Dialogs.aps differ diff --git a/Dialogs.rc b/Dialogs.rc index 9763a82..6913781 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +34,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#include ""windows.h""\r\n" "\0" END @@ -46,37 +46,6 @@ END #endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_TOOLBOX DIALOGEX 0, 0, 398, 64 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - CONTROL "",IDC_TOOLBOX_BROWSER, - "{A8F8E829-06DA-11D2-8D70-00A0C98B28E2}",WS_TABSTOP,0,0,398,64 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog Info -// - -IDD_TOOLBOX DLGINIT -BEGIN - IDC_TOOLBOX_BROWSER, 0x376, 76, 0 -0x0000, 0x0000, 0xb293, 0x0000, 0x0048, 0x0000, 0x0003, 0x0008, 0xf20b, -0x4757, 0x0020, 0x0000, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, -0x0074, 0x0078, 0x3db4, 0x0000, 0x0003, 0x0008, 0xf20a, 0x4757, 0xffe0, -0xffff, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0079, -0x0ac0, 0x0000, - 0 -END - #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// @@ -90,40 +59,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUT_DIALOG DIALOGEX 0, 0, 226, 151 -STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "About" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,169,130,50,14 - PUSHBUTTON "Cancel",IDCANCEL,112,130,50,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUT_DIALOG, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 219 - TOPMARGIN, 7 - BOTTOMMARGIN, 144 - END -END -#endif // APSTUDIO_INVOKED - - ///////////////////////////////////////////////////////////////////////////// // // Icon diff --git a/G3DTest.aps b/G3DTest.aps new file mode 100644 index 0000000..c8dcb23 Binary files /dev/null and b/G3DTest.aps differ diff --git a/G3DTest.vcproj b/G3DTest.vcproj index bb0178e..81f91c6 100644 --- a/G3DTest.vcproj +++ b/G3DTest.vcproj @@ -468,6 +468,10 @@ Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" > + + diff --git a/main.cpp b/main.cpp index c70c685..eed20b7 100644 --- a/main.cpp +++ b/main.cpp @@ -1693,8 +1693,10 @@ PropGrid_Enable(propGrid,true); MessageBox(NULL, "Failed to create HWND", (PlaceholderName + " Crash").c_str() , MB_OK); return 0; } + SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); + Demo demo = Demo(settings,hwndMain); demo.run(); diff --git a/resource.h b/resource.h index 56d9469..c955883 100644 --- a/resource.h +++ b/resource.h @@ -2,18 +2,15 @@ // Microsoft Visual C++ generated include file. // Used by Dialogs.rc // -#define IDD_ABOUT_DIALOG 102 -#define IDD_TOOLBOX 103 -#define IDI_ICON1 106 -#define IDC_TOOLBOX_BROWSER 1001 +#define IDI_ICON1 102 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 107 -#define _APS_NEXT_COMMAND_VALUE 40004 -#define _APS_NEXT_CONTROL_VALUE 1002 +#define _APS_NEXT_RESOURCE_VALUE 103 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif