wxUSE_STL fixes.

[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 3f4ab32ae551968e5ed5f2e378de5c9704f5b676..4a7e4ac4b3a34418a9977a9f210c17a914f8e0a0 100644 (file)
--- a/contrib/samples/ogl/studio/mainfrm.cpp
+++ b/contrib/samples/ogl/studio/mainfrm.cpp
@@ -52,8 +52,7 @@ BEGIN_EVENT_TABLE(csFrame, wxDocMDIParentFrame)
 END_EVENT_TABLE()
 
 // Define my frame constructor
 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):
+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, _T("frame"))
 {
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);
   wxDocMDIParentFrame(manager, parent, id, title, pos, size, style, _T("frame"))
 {
     CreateToolBar(wxNO_BORDER|wxTB_FLAT|wxTB_HORIZONTAL);


@@ -73,7 +72,10 @@ csFrame::csFrame(wxDocManager* manager, wxFrame *parent, wxWindowID id, const wx
 
 void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
 {
 
 void csFrame::OnHelp(wxCommandEvent& WXUNUSED(event))
 {

-    wxGetApp().GetHelpController().DisplayContents();
+    wxHelpControllerBase* help;
+    help = wxGetApp().GetHelpController();
+    if (help)
+        help->DisplayContents();

 }
 
 void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
 }
 
 void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))


@@ -85,7 +87,7 @@ void csFrame::OnSettings(wxCommandEvent& WXUNUSED(event))
 
 void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void csFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-      Close(TRUE);
+      Close(true);

 }
 
 void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 void csFrame::OnAbout(wxCommandEvent& WXUNUSED(event))


@@ -155,24 +157,24 @@ void csFrame::OnIdle(wxIdleEvent& event)
     wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
     if (!paletteWin || !diagramToolBarWin)
         return;
     wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
     if (!paletteWin || !diagramToolBarWin)
         return;

-    bool doLayout = FALSE;
+    bool doLayout = false;

     if (GetActiveChild())
     {
         if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
         {
     if (GetActiveChild())
     {
         if (!paletteWin->IsShown() || !diagramToolBarWin->IsShown())
         {

-            paletteWin->Show(TRUE);
-            diagramToolBarWin->Show(TRUE);
+            paletteWin->Show(true);
+            diagramToolBarWin->Show(true);

 
 

-            doLayout = TRUE;
+            doLayout = true;

         }
     }
     else
     {
         if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
         {
         }
     }
     else
     {
         if (paletteWin->IsShown() || diagramToolBarWin->IsShown())
         {

-            paletteWin->Show(FALSE);
-            diagramToolBarWin->Show(FALSE);
-            doLayout = TRUE;
+            paletteWin->Show(false);
+            diagramToolBarWin->Show(false);
+            doLayout = true;

         }
     }
     if (doLayout)
         }
     }
     if (doLayout)


@@ -186,7 +188,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
         // window doesn't cause the proper refresh. Just refreshing the
         // client doesn't work (presumably because it's clipping the
         // children).
         // window doesn't cause the proper refresh. Just refreshing the
         // client doesn't work (presumably because it's clipping the
         // children).

-        // FIXED in wxWindows, by intercepting wxMDIClientWindow::DoSetSize
+        // FIXED in wxWidgets, by intercepting wxMDIClientWindow::DoSetSize

         // and checking if the position has changed, before redrawing the
         // child windows.
 #if 0
         // and checking if the position has changed, before redrawing the
         // child windows.
 #if 0


@@ -206,7 +208,7 @@ void csFrame::OnIdle(wxIdleEvent& event)
 // General handler for disabling items
 void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
 {
 // General handler for disabling items
 void csFrame::OnUpdateDisable(wxUpdateUIEvent& event)
 {

-    event.Enable(FALSE);
+    event.Enable(false);

 }
 
 void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)
 }
 
 void csFrame::OnSaveUpdate(wxUpdateUIEvent& event)