added bookctrl.h and listbook.h; moved bookctrl.cpp to the correct place

[wxWidgets.git] / contrib / samples / ogl / studio / mainfrm.cpp

diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp
index c1d856c30122214b4f0691ddffbcef1c426b9c5e..4000fc7e02bbcb594f291977c68bd18fff33ddce 100644 (file)
--- a/contrib/samples/ogl/studio/mainfrm.cpp
+++ b/contrib/samples/ogl/studio/mainfrm.cpp
@@ -54,7 +54,7 @@ END_EVENT_TABLE()
 // Define my frame constructor
 csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
        long style):
 // Define my frame constructor
 csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
        long style):

-  wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, "frame")
+  wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))

 {
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
     wxGetApp().InitToolBar(GetToolBar());
 {
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
     wxGetApp().InitToolBar(GetToolBar());


@@ -71,26 +71,26 @@ csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wx
     SetAcceleratorTable(accel);
 }
 
     SetAcceleratorTable(accel);
 }
 

-void csFrame::OnHelp(wxCommandEvent& event)
+void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))

 {
     wxGetApp().GetHelpController().DisplayContents();
 }
 
 {
     wxGetApp().GetHelpController().DisplayContents();
 }
 

-void csFrame::OnSettings(wxCommandEvent& event)
+void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))

 {
     csSettingsDialog* dialog = new csSettingsDialog(this);
 {
     csSettingsDialog* dialog = new csSettingsDialog(this);

-    int ret = dialog->ShowModal();
+    /* int ret = */ dialog->ShowModal();

     dialog->Destroy();
 }
 
     dialog->Destroy();
 }
 

-void csFrame::OnQuit(wxCommandEvent& event)
+void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

 {
       Close(TRUE);
 }
 
 {
       Close(TRUE);
 }
 

-void csFrame::OnAbout(wxCommandEvent& event)
+void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

 {
 {

-      (void)wxMessageBox("OGL Studio\n(c) 1999, Julian Smart", "About OGL Studio", wxICON_INFORMATION);
+      (void)wxMessageBox(_T("OGL Studio\n(c) 1999, Julian Smart"), _T("About OGL Studio"), wxICON_INFORMATION);

 }
 
 void csFrame::OnSashDragPaletteWindow(wxSashEvent& event)
 }
 
 void csFrame::OnSashDragPaletteWindow(wxSashEvent& event)


@@ -141,7 +141,7 @@ void csFrame::OnCloseWindow(wxCloseEvent& event)
     wxDocMDIParentFrame::OnCloseWindow(event);
 }
 
     wxDocMDIParentFrame::OnCloseWindow(event);
 }
 

-void csFrame::OnSize(wxSizeEvent& event)
+void csFrame::OnSize(wxSizeEvent& WXUNUSED(event))

 {
     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);
 {
     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);


@@ -150,8 +150,6 @@ void csFrame::OnSize(wxSizeEvent& event)
 // Make sure the correct toolbars are showing for the active view
 void csFrame::OnIdle(wxIdleEvent& event)
 {
 // Make sure the correct toolbars are showing for the active view
 void csFrame::OnIdle(wxIdleEvent& event)
 {

-    wxDocMDIParentFrame::OnIdle(event);
-

     wxSashLayoutWindow* paletteWin = wxGetApp().GetDiagramPaletteSashWindow();
     wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
     if (!paletteWin || !diagramToolBarWin)
     wxSashLayoutWindow* paletteWin = wxGetApp().GetDiagramPaletteSashWindow();
     wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
     if (!paletteWin || !diagramToolBarWin)


@@ -201,6 +199,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
 #endif
 #endif
     }
 #endif
 #endif
     }

+    event.Skip();

 }
 
 // General handler for disabling items
 }
 
 // General handler for disabling items