added support for drop down toolbar buttons (patch 1713470)

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

diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 8a54f6f63d7450b1bdc29591b4c11c8faec38cb7..4c0aa56fa63fabd65b0862bf2f167685fc60810a 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$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -13,62 +13,129 @@
 class MyApp: public wxApp
 {
 public:
 class MyApp: public wxApp
 {
 public:

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

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

-// Define a new frame
-class MyTextWindow;
-class MyWindow;
-
-class MyFrame: public wxFrame
+// the main frame class
+class MyFrame : public wxFrame

 {
 public:
 {
 public:

-    MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h);
-
-    void OnQuit(wxCommandEvent& event);
+    MyFrame();

 
 

-    void TestSizers(wxCommandEvent& event);
+    void TestProportions(wxCommandEvent& event);
+    void TestFlexSizers(wxCommandEvent& event);

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

-    void About(wxCommandEvent& event);
+    void TestGridBagSizer(wxCommandEvent& event);
+    void TestNested(wxCommandEvent& event);
+    void TestSetMinimal(wxCommandEvent& event);
+
+    void OnAbout(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);

 
 private:
     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 showing the box sizer proportions
+class MyProportionsFrame : public wxFrame

 {
 public:
 {
 public:

-    MyTextWindow(wxFrame *frame, int x=-1, int y=-1, int width=-1, int height=-1,
-               long style=wxTE_MULTILINE):
-    wxTextCtrl(frame, -1, _T(""), wxPoint(x, y), wxSize(width, height), style)
-    {
-    }
+    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;

 };
 
 };
 

-// 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:
 {
 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:
 
 private:

+    void InitFlexSizer(wxFlexGridSizer *sizer, wxWindow* parent);
+};
+
+
+// a dialog using notebook sizer for layout
+class MySizerDialog : public wxDialog
+{
+public:
+    MySizerDialog(wxWindow *parent, const wxChar *title);
+};
+
+
+// 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()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-class MySizerFrame: public wxFrame
+
+// a frame for testing simple setting of "default size"
+class MySimpleSizerFrame : public wxFrame

 {
 public:
 {
 public:

-    wxPanel *panel;
-    MySizerFrame(wxFrame *frame, wxChar *title, int x, int y );
+    MySimpleSizerFrame(const wxChar *title, int x, int y );
+    
+    void OnSetSmallSize( wxCommandEvent &event);
+    void OnSetBigSize( wxCommandEvent &event);
+    
+private:
+    wxTextCtrl  *m_target;
+
+    DECLARE_EVENT_TABLE()
+};
+
+
+// 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 wxChar *title, int x, int y );
+    
+    
+private:
+    wxTextCtrl  *m_target;
+};
+
+// controls and menu constants
+enum
+{
+    LAYOUT_TEST_SIZER = 101,
+    LAYOUT_TEST_NB_SIZER,
+    LAYOUT_TEST_GB_SIZER,
+    LAYOUT_TEST_PROPORTIONS,
+    LAYOUT_TEST_SET_MINIMAL,
+    LAYOUT_TEST_NESTED,
+    LAYOUT_QUIT = wxID_EXIT,
+    LAYOUT_ABOUT = wxID_ABOUT

 };
 
 };
 

-#define LAYOUT_QUIT       100
-#define LAYOUT_TEST       101
-#define LAYOUT_ABOUT      102
-#define LAYOUT_TEST_SIZER 104
-#define LAYOUT_TEST_NB    105