Fix to wxTreeCtrl::GetNextChild from Marcel Rasche. Corrected WXUSINGDLL in 2 makefiles.

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

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index 073eac04e1d4114f3a06c2c6a4e491394d674f89..7415c60585ce796e6f8dbbc9f5f9638c3eba2f25 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -9,6 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
+#include <wx/toolbar.h>
+
 // Define a new application
 class MyApp: public wxApp
 {
@@ -26,33 +28,16 @@ class MyCanvas: public wxScrolledWindow
     DECLARE_EVENT_TABLE()
 };
 
-#ifdef __WINDOWS__
-
-class TestRibbon: public wxToolBar95
-{
-  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 __WINDOWS__    
-    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);