X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..0b659b0a51c13cdc4ed21f3f8c020c5055c6c024:/samples/layout/layout.h

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 83aca0d956..0ee6ccc438 100644
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -5,75 +5,66 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Define a new application
 class MyApp: public wxApp
 {
-  public:
-    MyApp(void) ;
-    bool OnInit(void);
+public:
+    MyApp();
+    bool OnInit();
 };
 
-// Define a new frame
-class MyTextWindow;
-class MyWindow;
-
-class MyFrame: public wxFrame
+// the main frame class
+class MyFrame : public wxFrame
 {
-  public:
-    wxPanel *panel;
-    MyTextWindow *text_window;
-    MyWindow *canvas;
-    MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    void OnSize(wxSizeEvent& event);
-    bool OnClose(void);
-    void Draw(wxDC& dc, bool draw_bitmaps = TRUE);
+public:
+    MyFrame();
+
+    void TestConstraints(wxCommandEvent& event);
+    void TestFlexSizers(wxCommandEvent& event);
+    void TestNotebookSizers(wxCommandEvent& event);
 
-    void LoadFile(wxCommandEvent& event);
-    void Quit(wxCommandEvent& event);
-    void TestSizers(wxCommandEvent& event);
-    void About(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
 
-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()
 };
 
-// Define a new text subwindow that can respond to drag-and-drop
-class MyTextWindow: public wxTextCtrl
+// a frame using constraints for layout
+class MyConstraintsFrame : public wxFrame
 {
-  public:
-  MyTextWindow(wxFrame *frame, int x=-1, int y=-1, int width=-1, int height=-1,
-               long style=wxTE_MULTILINE):
-    wxTextCtrl(frame, -1, "", wxPoint(x, y), wxSize(width, height), style)
-  {
-  }
+public:
+    MyConstraintsFrame(const wxChar *title, int x, int y );
 };
 
-// Define a new canvas which can receive some events
-class MyWindow: public wxWindow
+// a frame using flex sizers for layout
+class MyFlexSizerFrame : public wxFrame
 {
-  public:
-    MyWindow(wxFrame *frame, int x, int y, int w, int h, long style = wxRETAINED);
-    ~MyWindow(void) ;
-    void OnPaint(wxPaintEvent& event);
-    
-    DECLARE_EVENT_TABLE()
+public:
+    MyFlexSizerFrame(const wxChar *title, int x, int y );
+
+private:
+    void InitFlexSizer(wxFlexGridSizer *sizer);
 };
 
-class SizerFrame: public wxFrame
+// a dialog using notebook sizer for layout
+class MySizerDialog : public wxDialog
 {
-  public:
-    wxPanel *panel;
-    SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h);
-    void OnSize(wxSizeEvent& event);
-    bool OnClose(void);
+public:
+    MySizerDialog(wxWindow *parent, const wxChar *title);
+};
 
-   DECLARE_EVENT_TABLE()
+// controls an menu constants
+enum
+{
+    LAYOUT_QUIT = 100,
+    LAYOUT_ABOUT,
+    LAYOUT_TEST_CONSTRAINTS,
+    LAYOUT_TEST_SIZER,
+    LAYOUT_TEST_NB_SIZER
 };
 
-#define LAYOUT_QUIT       100
-#define LAYOUT_TEST       101
-#define LAYOUT_ABOUT      102
-#define LAYOUT_LOAD_FILE  103