X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e023db73b44392a07c52f88c9b11d34d312e89f..a1b2d8d9b9fe8213cf7827a12dee4251d3ea48a7:/samples/layout/layout.h

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index e671559dac..9b91dbd74e 100644
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,7 +13,7 @@
 class MyApp: public wxApp
 {
 public:
-    MyApp();
+    MyApp(){};
     bool OnInit();
 };
 
@@ -23,9 +23,9 @@ 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);
@@ -34,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
 {
@@ -48,9 +41,10 @@ public:
     MyFlexSizerFrame(const wxChar *title, int x, int y );
 
 private:
-    void InitFlexSizer(wxFlexGridSizer *sizer);
+    void InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent);
 };
 
+
 // a dialog using notebook sizer for layout
 class MySizerDialog : public wxDialog
 {
@@ -58,13 +52,42 @@ public:
     MySizerDialog(wxWindow *parent, const wxChar *title);
 };
 
-// controls an menu constants
+
+// a frame using wxGridBagSizer for layout
+class MyGridBagSizerFrame : public wxFrame
+{
+public:
+    MyGridBagSizerFrame(const wxChar *title, int x, int y );
+
+    void OnHideBtn(wxCommandEvent&);
+    void OnShowBtn(wxCommandEvent&);
+    void OnMoveBtn(wxCommandEvent&);
+
+private:
+    wxGridBagSizer*     m_gbs;
+    wxPanel*            m_panel;
+    wxButton*           m_hideBtn;
+    wxButton*           m_showBtn;
+    wxTextCtrl*         m_hideTxt;
+
+    wxButton*           m_moveBtn1;
+    wxButton*           m_moveBtn2;
+    wxGBPosition        m_lastPos;
+
+    DECLARE_EVENT_TABLE()
+};
+
+
+
+
+
+// controls and menu constants
 enum
 {
     LAYOUT_QUIT = 100,
     LAYOUT_ABOUT,
-    LAYOUT_TEST_CONSTRAINTS,
     LAYOUT_TEST_SIZER,
-    LAYOUT_TEST_NB_SIZER
+    LAYOUT_TEST_NB_SIZER,
+    LAYOUT_TEST_GB_SIZER
 };