comparison dwtestoo.cpp @ 2915:0cde119fc945

C++: Fix initialization and #define reused strings.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 28 Dec 2022 02:46:58 +0000
parents 8af64b6d75a9
children fe43f8667d3d
comparison
equal deleted inserted replaced
2914:8af64b6d75a9 2915:0cde119fc945
25 #endif 25 #endif
26 26
27 #define SHAPES_DOUBLE_BUFFERED 0 27 #define SHAPES_DOUBLE_BUFFERED 0
28 #define SHAPES_DIRECT 1 28 #define SHAPES_DIRECT 1
29 #define DRAW_FILE 2 29 #define DRAW_FILE 2
30
31 #define APP_TITLE "Dynamic Windows C++"
32 #define APP_EXIT "Are you sure you want to exit?"
30 33
31 class DWTest : public DW::Window 34 class DWTest : public DW::Window
32 { 35 {
33 private: 36 private:
34 const char *ResolveKeyName(int vk) { 37 const char *ResolveKeyName(int vk) {
138 141
139 // add menus to the menubar 142 // add menus to the menubar
140 DW::Menu *menu = new DW::Menu(); 143 DW::Menu *menu = new DW::Menu();
141 DW::MenuItem *menuitem = menu->AppendItem("~Quit"); 144 DW::MenuItem *menuitem = menu->AppendItem("~Quit");
142 menuitem->ConnectClicked([this] () -> int 145 menuitem->ConnectClicked([this] () -> int
143 { 146 {
144 if(this->app->MessageBox("dwtestoo", DW_MB_YESNO | DW_MB_QUESTION, "Are you sure you want to exit?") != 0) { 147 if(this->app->MessageBox(APP_TITLE, DW_MB_YESNO | DW_MB_QUESTION, APP_EXIT) != 0) {
145 this->app->MainQuit(); 148 this->app->MainQuit();
146 } 149 }
147 return TRUE; 150 return TRUE;
148 }); 151 });
149 152
150 // Add the "File" menu to the menubar... 153 // Add the "File" menu to the menubar...
151 menubar->AppendItem("~File", menu); 154 menubar->AppendItem("~File", menu);
152 155
153 menu = new DW::Menu(); 156 menu = new DW::Menu();
184 menuitem->ConnectClicked([this]() -> int 187 menuitem->ConnectClicked([this]() -> int
185 { 188 {
186 DWEnv env; 189 DWEnv env;
187 190
188 this->app->GetEnvironment(&env); 191 this->app->GetEnvironment(&env);
189 this->app->MessageBox("About dwindows", DW_MB_OK | DW_MB_INFORMATION, "dwindows test\n\nOS: %s %s %s Version: %d.%d.%d.%d\n\nHTML: %s\n\ndwindows Version: %d.%d.%d\n\nScreen: %dx%d %dbpp", 192 this->app->MessageBox("About dwindows", DW_MB_OK | DW_MB_INFORMATION,
190 env.osName, env.buildDate, env.buildTime, 193 "dwindows test\n\nOS: %s %s %s Version: %d.%d.%d.%d\n\nHTML: %s\n\ndwindows Version: %d.%d.%d\n\nScreen: %dx%d %dbpp",
191 env.MajorVersion, env.MinorVersion, env.MajorBuild, env.MinorBuild, 194 env.osName, env.buildDate, env.buildTime,
192 env.htmlEngine, 195 env.MajorVersion, env.MinorVersion, env.MajorBuild, env.MinorBuild,
193 env.DWMajorVersion, env.DWMinorVersion, env.DWSubVersion, 196 env.htmlEngine,
194 this->app->GetScreenWidth(), this->app->GetScreenHeight(), this->app->GetColorDepth()); 197 env.DWMajorVersion, env.DWMinorVersion, env.DWSubVersion,
198 this->app->GetScreenWidth(), this->app->GetScreenHeight(), this->app->GetColorDepth());
195 return FALSE; 199 return FALSE;
196 }); 200 });
197 // Add the "Help" menu to the menubar... 201 // Add the "Help" menu to the menubar...
198 menubar->AppendItem("~Help", menu); 202 menubar->AppendItem("~Help", menu);
199 } 203 }
348 return TRUE; 352 return TRUE;
349 }); 353 });
350 354
351 cancelbutton->ConnectClicked([this] () -> int 355 cancelbutton->ConnectClicked([this] () -> int
352 { 356 {
353 if(this->app->MessageBox("dwtest", DW_MB_YESNO | DW_MB_QUESTION, "Are you sure you want to exit?") != 0) { 357 if(this->app->MessageBox(APP_TITLE, DW_MB_YESNO | DW_MB_QUESTION, APP_EXIT) != 0) {
354 this->app->MainQuit(); 358 this->app->MainQuit();
355 } 359 }
356 return TRUE; 360 return TRUE;
357 }); 361 });
358 362
371 return FALSE; 375 return FALSE;
372 }); 376 });
373 } 377 }
374 public: 378 public:
375 // Constructor creates the application 379 // Constructor creates the application
376 DWTest(const char *title) { 380 DWTest(const char *title): DW::Window(title) {
377 char fileiconpath[1025] = "file"; 381 char fileiconpath[1025] = "file";
378 char foldericonpath[1025] = "folder"; 382 char foldericonpath[1025] = "folder";
379 383
380 // Get our application singleton 384 // Get our application singleton
381 app = DW::App::Init(); 385 app = DW::App::Init();
481 int menu_enabled = 1; 485 int menu_enabled = 1;
482 char *current_file = NULL; 486 char *current_file = NULL;
483 HICN fileicon,foldericon; 487 HICN fileicon,foldericon;
484 488
485 int OnDelete() override { 489 int OnDelete() override {
486 if(app->MessageBox("dwtest", DW_MB_YESNO | DW_MB_QUESTION, "Are you sure you want to exit?") != 0) { 490 if(app->MessageBox(APP_TITLE, DW_MB_YESNO | DW_MB_QUESTION, APP_EXIT) != 0) {
487 app->MainQuit(); 491 app->MainQuit();
488 } 492 }
489 return TRUE; 493 return TRUE;
490 } 494 }
491 }; 495 };