Watcom does not accept #warning but supports more than MSW port.

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

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 50901164762824b85b33c9365a8a5b5e1c81cb60..f66fbec37bb32e093581dbee42029fd3183233a3 100644 (file)
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -13,7 +13,7 @@
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

-    MyApp();
+    MyApp(){};

     bool OnInit();
 };
 
     bool OnInit();
 };
 


@@ -23,11 +23,11 @@ class MyFrame : public wxFrame
 public:
     MyFrame();
 
 public:
     MyFrame();
 

-    void TestConstraints(wxCommandEvent& event);
+    void TestProportions(wxCommandEvent& event);

     void TestFlexSizers(wxCommandEvent& event);
     void TestNotebookSizers(wxCommandEvent& event);
     void TestGridBagSizer(wxCommandEvent& event);
     void TestFlexSizers(wxCommandEvent& event);
     void TestNotebookSizers(wxCommandEvent& event);
     void TestGridBagSizer(wxCommandEvent& event);

-    
+

     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
 
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
 


@@ -35,11 +35,20 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-// a frame using constraints for layout
-class MyConstraintsFrame : public wxFrame
+// a frame showing the box sizer proportions
+class MyProportionsFrame : public wxFrame

 {
 public:
 {
 public:

-    MyConstraintsFrame(const wxChar *title, int x, int y );
+    MyProportionsFrame(wxFrame *parent);
+
+protected:
+    void UpdateProportions();
+
+    void OnProportionChanged(wxSpinEvent& event);
+    void OnProportionUpdated(wxCommandEvent& event);
+
+    wxSpinCtrl *m_spins[3]; // size can be changed without changing anything else
+    wxSizer *m_sizer;

 };
 
 // a frame using flex sizers for layout
 };
 
 // a frame using flex sizers for layout


@@ -49,7 +58,7 @@ public:
     MyFlexSizerFrame(const wxChar *title, int x, int y );
 
 private:
     MyFlexSizerFrame(const wxChar *title, int x, int y );
 
 private:

-    void InitFlexSizer(wxFlexGridSizer *sizer);
+    void InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent);

 };
 
 
 };
 
 


@@ -70,7 +79,7 @@ public:
     void OnHideBtn(wxCommandEvent&);
     void OnShowBtn(wxCommandEvent&);
     void OnMoveBtn(wxCommandEvent&);
     void OnHideBtn(wxCommandEvent&);
     void OnShowBtn(wxCommandEvent&);
     void OnMoveBtn(wxCommandEvent&);

-    
+

 private:
     wxGridBagSizer*     m_gbs;
     wxPanel*            m_panel;
 private:
     wxGridBagSizer*     m_gbs;
     wxPanel*            m_panel;


@@ -81,7 +90,7 @@ private:
     wxButton*           m_moveBtn1;
     wxButton*           m_moveBtn2;
     wxGBPosition        m_lastPos;
     wxButton*           m_moveBtn1;
     wxButton*           m_moveBtn2;
     wxGBPosition        m_lastPos;

-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -92,11 +101,11 @@ private:
 // controls and menu constants
 enum
 {
 // controls and menu constants
 enum
 {

-    LAYOUT_QUIT = 100,
-    LAYOUT_ABOUT,
-    LAYOUT_TEST_CONSTRAINTS,
-    LAYOUT_TEST_SIZER,
+    LAYOUT_TEST_SIZER = 101,

     LAYOUT_TEST_NB_SIZER,
     LAYOUT_TEST_NB_SIZER,

-    LAYOUT_TEST_GB_SIZER
+    LAYOUT_TEST_GB_SIZER,
+    LAYOUT_TEST_PROPORTIONS,
+    LAYOUT_QUIT = wxID_EXIT,
+    LAYOUT_ABOUT = wxID_ABOUT

 };
 
 };