X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94f52d90c97b067b4626cc4cd6ac46a71fa54484..3e03bdd85f736ea544012048c9f18abb3ccf7cd6:/samples/dynamic/dynamic.cpp

diff --git a/samples/dynamic/dynamic.cpp b/samples/dynamic/dynamic.cpp
index 3bf016f19f..56eb23a1e0 100644
--- a/samples/dynamic/dynamic.cpp
+++ b/samples/dynamic/dynamic.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation "dynamic.cpp"
 #pragma interface "dynamic.cpp"
 #endif
@@ -25,7 +25,7 @@
 #include "wx/wx.h"
 #endif
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
 #include "mondrian.xpm"
 #endif
 
@@ -38,34 +38,37 @@ class MyApp: public wxApp
 // Define a new frame type
 class MyFrame: public wxFrame
 { public:
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    
+    MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
+
  public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
-	bool OnClose(void) { return TRUE; }
 };
 
 // ID for the menu commands
-#define DYNAMIC_QUIT 	1
-#define DYNAMIC_TEXT 	101
-#define DYNAMIC_ABOUT 	102
+#define DYNAMIC_QUIT   1
+#define DYNAMIC_TEXT   101
+#define DYNAMIC_ABOUT   102
 
 // Create a new application object
-IMPLEMENT_APP	(MyApp)
+IMPLEMENT_APP  (MyApp)
 
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, "Dynamic wxWindows App", 50, 50, 450, 340);
+  MyFrame *frame = new MyFrame(NULL, _T("Dynamic wxWindows App"), 50, 50, 450, 340);
 
-  frame->Connect( DYNAMIC_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) MyFrame::OnQuit );
-  frame->Connect( DYNAMIC_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) MyFrame::OnAbout );
+  frame->Connect( DYNAMIC_QUIT,  -1, wxEVT_COMMAND_MENU_SELECTED,
+                  (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)
+                  &MyFrame::OnQuit );
+  frame->Connect( DYNAMIC_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED,
+                  (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction)
+                  &MyFrame::OnAbout );
 
   // Give it an icon
 #ifdef __WXMSW__
-  frame->SetIcon(wxIcon("mondrian"));
+  frame->SetIcon(wxIcon(_T("mondrian")));
 #else
   frame->SetIcon(wxIcon(mondrian_xpm));
 #endif
@@ -73,27 +76,27 @@ bool MyApp::OnInit(void)
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
-  file_menu->Append(DYNAMIC_ABOUT, "&About");
-  file_menu->Append(DYNAMIC_QUIT, "E&xit");
+  file_menu->Append(DYNAMIC_ABOUT, _T("&About"));
+  file_menu->Append(DYNAMIC_QUIT, _T("E&xit"));
   wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "&File");
+  menu_bar->Append(file_menu, _T("&File"));
   frame->SetMenuBar(menu_bar);
 
   // Make a panel with a message
   wxPanel *panel = new wxPanel(frame, -1, wxPoint(0, 0), wxSize(400, 200), wxTAB_TRAVERSAL);
 
-  (void)new wxStaticText(panel, 311, "Hello!", wxPoint(10, 10), wxSize(-1, -1), 0);
+  (void)new wxStaticText(panel, 311, _T("Hello!"), wxPoint(10, 10), wxSize(-1, -1), 0);
 
   // Show the frame
   frame->Show(TRUE);
-  
+
   SetTopWindow(frame);
 
   return TRUE;
 }
 
 // My frame constructor
-MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
+MyFrame::MyFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h):
   wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {}
 
@@ -104,8 +107,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
-  wxMessageDialog dialog(this, "This demonstrates dynamic event handling",
-  	"About Dynamic", wxYES_NO|wxCANCEL);
+  wxMessageDialog dialog(this, _T("This demonstrates dynamic event handling"),
+    _T("About Dynamic"), wxYES_NO|wxCANCEL);
 
   dialog.ShowModal();
 }