Unregister the object too

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

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 50901164762824b85b33c9365a8a5b5e1c81cb60..e2429e5cc6e1fe37d61a505e4bf56b3345b70355 100644 (file)
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -13,7 +13,7 @@
 class MyApp: public wxApp
 {
 public:
-    MyApp();
+    MyApp(){};
     bool OnInit();
 };
 
@@ -23,11 +23,10 @@ class MyFrame : public wxFrame
 public:
     MyFrame();
 
-    void TestConstraints(wxCommandEvent& event);
     void TestFlexSizers(wxCommandEvent& event);
     void TestNotebookSizers(wxCommandEvent& event);
     void TestGridBagSizer(wxCommandEvent& event);
-    
+
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
 
@@ -35,13 +34,6 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-// a frame using constraints for layout
-class MyConstraintsFrame : public wxFrame
-{
-public:
-    MyConstraintsFrame(const wxChar *title, int x, int y );
-};
-
 // a frame using flex sizers for layout
 class MyFlexSizerFrame : public wxFrame
 {
@@ -49,7 +41,7 @@ public:
     MyFlexSizerFrame(const wxChar *title, int x, int y );
 
 private:
-    void InitFlexSizer(wxFlexGridSizer *sizer);
+    void InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent);
 };
 
 
@@ -70,7 +62,7 @@ public:
     void OnHideBtn(wxCommandEvent&);
     void OnShowBtn(wxCommandEvent&);
     void OnMoveBtn(wxCommandEvent&);
-    
+
 private:
     wxGridBagSizer*     m_gbs;
     wxPanel*            m_panel;
@@ -81,7 +73,7 @@ private:
     wxButton*           m_moveBtn1;
     wxButton*           m_moveBtn2;
     wxGBPosition        m_lastPos;
-    
+
     DECLARE_EVENT_TABLE()
 };
 
@@ -92,11 +84,10 @@ private:
 // controls and menu constants
 enum
 {
-    LAYOUT_QUIT = 100,
-    LAYOUT_ABOUT,
-    LAYOUT_TEST_CONSTRAINTS,
-    LAYOUT_TEST_SIZER,
-    LAYOUT_TEST_NB_SIZER,
-    LAYOUT_TEST_GB_SIZER
+    LAYOUT_QUIT = wxID_EXIT,
+    LAYOUT_ABOUT = wxID_ABOUT,
+    LAYOUT_TEST_SIZER = 101,
+    LAYOUT_TEST_NB_SIZER = 102,
+    LAYOUT_TEST_GB_SIZER = 103
 };