X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92c0c17272f3cf7c8e54c17e1799d3813dbb459c..e1efca652844273c3e8d32c7e5f442b87e455ca7:/samples/layout/layout.h?ds=sidebyside

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 965bcfc5ad..4b9edcad45 100644
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
@@ -27,7 +27,9 @@ public:
     void TestFlexSizers(wxCommandEvent& event);
     void TestNotebookSizers(wxCommandEvent& event);
     void TestGridBagSizer(wxCommandEvent& event);
+    void TestNested(wxCommandEvent& event);
     void TestSetMinimal(wxCommandEvent& event);
+    void TestWrap(wxCommandEvent& event);
 
     void OnAbout(wxCommandEvent& event);
     void OnQuit(wxCommandEvent& event);
@@ -56,7 +58,7 @@ protected:
 class MyFlexSizerFrame : public wxFrame
 {
 public:
-    MyFlexSizerFrame(const wxChar *title, int x, int y );
+    MyFlexSizerFrame(const wxString &title, int x, int y );
 
 private:
     void InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent);
@@ -67,7 +69,7 @@ private:
 class MySizerDialog : public wxDialog
 {
 public:
-    MySizerDialog(wxWindow *parent, const wxChar *title);
+    MySizerDialog(wxWindow *parent, const wxString &title );
 };
 
 
@@ -75,7 +77,7 @@ public:
 class MyGridBagSizerFrame : public wxFrame
 {
 public:
-    MyGridBagSizerFrame(const wxChar *title, int x, int y );
+    MyGridBagSizerFrame(const wxString &title, int x, int y );
 
     void OnHideBtn(wxCommandEvent&);
     void OnShowBtn(wxCommandEvent&);
@@ -100,11 +102,11 @@ private:
 class MySimpleSizerFrame : public wxFrame
 {
 public:
-    MySimpleSizerFrame(const wxChar *title, int x, int y );
-    
+    MySimpleSizerFrame(const wxString &title, int x, int y );
+
     void OnSetSmallSize( wxCommandEvent &event);
     void OnSetBigSize( wxCommandEvent &event);
-    
+
 private:
     wxTextCtrl  *m_target;
 
@@ -112,6 +114,27 @@ private:
 };
 
 
+// a frame for testing simple setting of a frame containing
+// a sizer containing a panel containing a sizer containing
+// controls
+class MyNestedSizerFrame : public wxFrame
+{
+public:
+    MyNestedSizerFrame(const wxString &title, int x, int y );
+
+
+private:
+    wxTextCtrl  *m_target;
+};
+
+// a frame with several wrapping sizers
+
+class MyWrapSizerFrame: public wxFrame
+{
+public:
+    MyWrapSizerFrame(const wxString &title, int x, int y );
+};
+
 // controls and menu constants
 enum
 {
@@ -120,6 +143,8 @@ enum
     LAYOUT_TEST_GB_SIZER,
     LAYOUT_TEST_PROPORTIONS,
     LAYOUT_TEST_SET_MINIMAL,
+    LAYOUT_TEST_NESTED,
+    LAYOUT_TEST_WRAP,
     LAYOUT_QUIT = wxID_EXIT,
     LAYOUT_ABOUT = wxID_ABOUT
 };