Motif additions

[wxWidgets.git] / samples / resource / resource.cpp

diff --git a/samples/resource/resource.cpp b/samples/resource/resource.cpp
index 89952f18ea226bae2e7ce23396f29514e7a8550f..4a981f9ba45b7aa4c8bc664831edcd1a43bdea26 100644 (file)
--- a/samples/resource/resource.cpp
+++ b/samples/resource/resource.cpp
@@ -42,7 +42,7 @@
 // the TEXT resource, for some reason, so either run-time file loading
 // or file inclusion should be used.
 
-#if defined(__WINDOWS__) && !defined(__BORLANDC__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__BORLANDC__) && !defined(__GNUWIN32__)
 // Under Windows, some compilers can't include
 // a whole .wxr file. So we use a .rc user-defined resource
 // instead. dialog1 will point to the whole .wxr 'file'.
@@ -56,7 +56,7 @@ static char *menu1 = NULL;
 #endif
 
 // Declare two frames
-MyFrame   *frame = NULL;
+MyFrame   *frame = (MyFrame *) NULL;
 
 IMPLEMENT_APP(MyApp)
 
@@ -69,7 +69,7 @@ MyApp::MyApp()
 // main frame
 bool MyApp::OnInit(void)
 {
-#if defined(__WINDOWS__)  && !defined(__BORLANDC__)
+#if defined(__WXMSW__)  && !defined(__BORLANDC__)
   // Load the .wxr 'file' from a .rc resource, under Windows.
   dialog1 = wxLoadUserResource("dialog1");
   menu1 = wxLoadUserResource("menu1");
@@ -86,7 +86,7 @@ bool MyApp::OnInit(void)
 #endif
 
   // Create the main frame window
-  frame = new MyFrame(NULL, -1, "wxWindows Resource Sample", wxPoint(0, 0), wxSize(300, 250));
+  frame = new MyFrame((wxFrame *) NULL, -1, (char *) "wxWindows Resource Sample", wxPoint(0, 0), wxSize(300, 250));
 
   // Give it a status line
   frame->CreateStatusBar(2);
@@ -109,7 +109,7 @@ bool MyApp::OnInit(void)
   frame->SetMenuBar(menu_bar);
 
   // Make a panel
-  frame->panel = new wxWindow(frame, -1, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame");
+  frame->panel = new MyPanel(frame, -1, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame");
   frame->Show(TRUE);
 
   SetTopWindow(frame);
@@ -117,6 +117,24 @@ bool MyApp::OnInit(void)
   return TRUE;
 }
 
+BEGIN_EVENT_TABLE(MyPanel, wxPanel)
+       EVT_LEFT_DOWN( MyPanel::OnClick)
+END_EVENT_TABLE()
+
+MyPanel::MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, 
+  int style, const wxString &name ) : 
+  wxPanel( parent, id, pos, size, style, name )
+{
+}
+
+void MyPanel::OnClick( wxMouseEvent &WXUNUSED(event) )
+{
+  MyFrame *frame = (MyFrame*)(wxTheApp->GetTopWindow());
+  wxCommandEvent event;
+  frame->OnTest1( event );
+}
+
+
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
        EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit)
        EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1)
@@ -126,15 +144,15 @@ END_EVENT_TABLE()
 MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size):
   wxFrame(parent, id, title, pos, size)
 {
-  panel = NULL;
+  panel = (wxWindow *) NULL;
 }
 
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
        Close(TRUE);
 }
 
-void MyFrame::OnTest1(wxCommandEvent& event)
+void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event) )
 {
       MyDialog *dialog = new MyDialog;
       if (dialog->LoadFromResource(this, "dialog1"))
@@ -161,12 +179,12 @@ BEGIN_EVENT_TABLE(MyDialog, wxDialog)
 END_EVENT_TABLE()
 
 
-void MyDialog::OnOk(wxCommandEvent& event)
+void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event) )
 {
   EndModal(RESOURCE_OK);
 }
 
-void MyDialog::OnCancel(wxCommandEvent& event)
+void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event) )
 {
   EndModal(RESOURCE_CANCEL);
 }