suppressed VC++ 5.0 bool to int conversion warning (when compiling with

[wxWidgets.git] / samples / mdi / mdi.h

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index 47d61ee24eb57ed6d29a8aa8d2eda899b1623ab3..7415c60585ce796e6f8dbbc9f5f9638c3eba2f25 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -9,13 +9,7 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __WXMSW__
-#ifdef __WIN95__
-#define wxToolBar wxToolBar95
-#else
-#define wxToolBar wxToolBarMSW
-#endif
-#endif
+#include <wx/toolbar.h>
 
 // Define a new application
 class MyApp: public wxApp
@@ -34,33 +28,16 @@ class MyCanvas: public wxScrolledWindow
     DECLARE_EVENT_TABLE()
 };
 
-#ifdef __WXMSW__
-
-class TestRibbon: public wxToolBar
-{
-  public:
-  TestRibbon(wxFrame *frame, int x = 0, int y = 0, int w = -1, int h = -1,
-            long style = wxNO_BORDER, int direction = wxVERTICAL, int RowsOrColumns = 2);
-  bool OnLeftClick(int toolIndex, bool toggled);
-  void OnMouseEnter(int toolIndex);
-  void OnPaint(wxPaintEvent& event);
-  
-  DECLARE_EVENT_TABLE()
-};
-
-#endif
-
 // Define a new frame
 class MyFrame: public wxMDIParentFrame
 {
   public:
     wxTextCtrl *textWindow;
     
-#ifdef __WXMSW__    
-    TestRibbon* toolBar;
-#endif
-
     MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
+
+    void InitToolBar(wxToolBar* toolBar);
+
     bool OnClose(void);
     void OnSize(wxSizeEvent& event);
     void OnAbout(wxCommandEvent& event);
@@ -77,7 +54,6 @@ class MyChild: public wxMDIChildFrame
     MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
     ~MyChild(void);
     bool OnClose(void);
-    void OnSize(wxSizeEvent& event);
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);