SN: Replaced more ':' in VPATH statements by PATH_IFS (to make

[wxWidgets.git] / samples / minifram / test.h

diff --git a/samples/minifram/test.h b/samples/minifram/test.h
index db0f7dc5daebf1e2e2a0de357f8468e10a63b4c4..f228439556eaf2175319deeb7ccdd10c997795dd 100644 (file)
--- a/samples/minifram/test.h
+++ b/samples/minifram/test.h
@@ -19,17 +19,32 @@ class MyApp: public wxApp
     bool InitToolbar(wxToolBar* toolBar);
 };
 
     bool InitToolbar(wxToolBar* toolBar);
 };
 

+// Define a new mini frame
+class MyMiniFrame: public wxMiniFrame
+{
+public:
+    MyMiniFrame(wxFrame *parent, wxWindowID id = -1, const wxString& title = "wxToolBar Sample",
+        const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
+
+    void OnCloseWindow(wxCloseEvent& event);
+    void OnReparent(wxCommandEvent& event);
+    
+DECLARE_EVENT_TABLE()
+};
+

 // Define a new frame
 // Define a new frame

-class MyFrame: public wxMiniFrame
+class MyMainFrame: public wxFrame

 {
 public:
 {
 public:

-    MyFrame(wxFrame *parent, wxWindowID id = -1, const wxString& title = "wxToolBar Sample",
+    MyMainFrame(wxFrame *parent, wxWindowID id = -1, const wxString& title = "wxToolBar Sample",

         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
 
     void OnCloseWindow(wxCloseEvent& event);
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize );
 
     void OnCloseWindow(wxCloseEvent& event);

+    void OnReparent(wxCommandEvent& event);

     
 DECLARE_EVENT_TABLE()
 };
 
     
 DECLARE_EVENT_TABLE()
 };
 

-#define ID_TOOLBAR  500
+#define ID_TOOLBAR   500
+#define ID_REPARENT  501