Some bakefile fixes.

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

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index e70addbe1ade1073e008a38f08875e13d285b010..0ee6ccc438691ebee5e60cf9a2136969baab10e9 100644 (file)
--- 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,58 +17,54 @@ public:
     bool OnInit();
 };
 
-// Define a new frame
-class MyTextWindow;
-class MyWindow;
-
-class MyFrame: public wxFrame
+// the main frame class
+class MyFrame : public wxFrame
 {
 public:
-    MyFrame(wxFrame *frame, const char *title, int x, int y, int w, int h);
-
-    void OnQuit(wxCommandEvent& event);
+    MyFrame();
 
-    void TestSizers(wxCommandEvent& event);
+    void TestConstraints(wxCommandEvent& event);
+    void TestFlexSizers(wxCommandEvent& event);
     void TestNotebookSizers(wxCommandEvent& event);
-    void About(wxCommandEvent& event);
+
+    void OnAbout(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
 
 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)
-    {
-    }
-
+    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 OnPaint(wxPaintEvent& event);
+    MyFlexSizerFrame(const wxChar *title, int x, int y );
 
 private:
-    DECLARE_EVENT_TABLE()
+    void InitFlexSizer(wxFlexGridSizer *sizer);
 };
 
-class MySizerFrame: public wxFrame
+// a dialog using notebook sizer for layout
+class MySizerDialog : public wxDialog
 {
 public:
-    wxPanel *panel;
-    MySizerFrame(wxFrame *frame, char *title, int x, int y );
+    MySizerDialog(wxWindow *parent, const wxChar *title);
+};
+
+// 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_TEST_SIZER 104
-#define LAYOUT_TEST_NB    105