fixed GetMargins() compilation

[wxWidgets.git] / include / wx / sizer.h

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 6b5ecfa583c5afb73c3c739b25ec6a2340a1f736..32cff00a7cf092d8fac3ed6f539deefbd7f320c7 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -40,71 +40,85 @@ class wxStaticBoxSizer;
 
 class WXDLLEXPORT wxSizerItem: public wxObject
 {
 
 class WXDLLEXPORT wxSizerItem: public wxObject
 {

-    DECLARE_CLASS(wxSizerItem);

 public:
 public:

-  // spacer
-  wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
-
-  // window
-  wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
-
-  // subsizer
-  wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
-
-  ~wxSizerItem();
-
-  virtual wxSize GetSize();
-  virtual wxSize CalcMin();
-  virtual void SetDimension( wxPoint pos, wxSize size );
-
-  void SetRatio( int width, int height )
-    // if either of dimensions is zero, ratio is assumed to be 1
-    // to avoid "divide by zero" errors
-    { m_ratio = (width && height) ? ((float) width / (float) height) : 1; }
-  void SetRatio( wxSize size )
-    { m_ratio = (size.x && size.y) ? ((float) size.x / (float) size.y) : 1; }
-  void SetRatio( float ratio ) { m_ratio = ratio; }
-  float GetRatio() const { return m_ratio; }
-
-  bool IsWindow();
-  bool IsSizer();
-  bool IsSpacer();
+    // spacer
+    wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
+
+    // window
+    wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
+
+    // subsizer
+    wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
+
+    ~wxSizerItem();
+
+    virtual wxSize GetSize();
+    virtual wxSize CalcMin();
+    virtual void SetDimension( wxPoint pos, wxSize size );
+
+    wxSize GetMinSize()
+        { return m_minSize; }
+
+    void SetRatio( int width, int height )
+        // if either of dimensions is zero, ratio is assumed to be 1
+        // to avoid "divide by zero" errors
+        { m_ratio = (width && height) ? ((float) width / (float) height) : 1; }
+    void SetRatio( wxSize size )
+        { m_ratio = (size.x && size.y) ? ((float) size.x / (float) size.y) : 1; }
+    void SetRatio( float ratio ) 
+        { m_ratio = ratio; }
+    float GetRatio() const 
+        { return m_ratio; }
+
+    bool IsWindow();
+    bool IsSizer();
+    bool IsSpacer();

   
   

-  void SetInitSize( int x, int y )
-    { m_minSize.x = x; m_minSize.y = y; }
-  void SetOption( int option )
-    { m_option = option; }
-  void SetFlag( int flag )
-    { m_flag = flag; }
-  void SetBorder( int border )
-    { m_border = border; }
-
-  wxWindow *GetWindow() const
-    { return m_window; }
-  wxSizer *GetSizer() const
-    { return m_sizer; }
-  int GetOption() const
-    { return m_option; }
-  int GetFlag() const
-    { return m_flag; }
-  int GetBorder() const
-    { return m_border; }
-  wxObject* GetUserData()
-    { return m_userData; }
+    void SetInitSize( int x, int y )
+        { m_minSize.x = x; m_minSize.y = y; }
+    void SetOption( int option )
+        { m_option = option; }
+    void SetFlag( int flag )
+        { m_flag = flag; }
+    void SetBorder( int border )
+        { m_border = border; }
+
+    wxWindow *GetWindow() const
+        { return m_window; }
+    void SetWindow( wxWindow *window )
+        { m_window = window; }
+    wxSizer *GetSizer() const
+        { return m_sizer; }
+    void SetSizer( wxSizer *sizer )
+        { m_sizer = sizer; }
+    int GetOption() const
+        { return m_option; }
+    int GetFlag() const
+        { return m_flag; }
+    int GetBorder() const
+        { return m_border; }
+    wxObject* GetUserData()
+        { return m_userData; }
+    wxPoint GetPosition()
+        { return m_pos; }

 
 protected:
 
 protected:

-  wxWindow    *m_window;
-  wxSizer     *m_sizer;
-  wxSize       m_size;
-  wxSize       m_minSize;
-  int          m_option;
-  int          m_border;
-  int          m_flag;
-  // als: aspect ratio can always be calculated from m_size,
-  //      but this would cause precision loss when the window
-  //      is shrinked.  it is safer to preserve initial value.
-  float        m_ratio;
-  wxObject    *m_userData;
+    wxWindow    *m_window;
+    wxSizer     *m_sizer;
+    wxSize       m_size;
+    wxPoint      m_pos;
+    wxSize       m_minSize;
+    int          m_option;
+    int          m_border;
+    int          m_flag;
+    // als: aspect ratio can always be calculated from m_size,
+    //      but this would cause precision loss when the window
+    //      is shrinked.  it is safer to preserve initial value.
+    float        m_ratio;
+    wxObject    *m_userData;
+  
+private:
+    DECLARE_CLASS(wxSizerItem);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -113,49 +127,150 @@ protected:
 
 class WXDLLEXPORT wxSizer: public wxObject
 {
 
 class WXDLLEXPORT wxSizer: public wxObject
 {

-    DECLARE_CLASS(wxSizer);

 public:
 public:

-   wxSizer();
-   ~wxSizer();
-
-   virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-   virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-   virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-
-   virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-   virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-   virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-
-   virtual bool Remove( wxWindow *window );
-   virtual bool Remove( wxSizer *sizer );
-   virtual bool Remove( int pos );
+    wxSizer();
+    ~wxSizer();
+
+    /* These should be called Append() really. */
+    virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+    virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+    virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+
+    virtual void Insert( int before, wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+    virtual void Insert( int before, wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+    virtual void Insert( int before, int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+
+    virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+    virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+    virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
+
+    virtual bool Remove( wxWindow *window );
+    virtual bool Remove( wxSizer *sizer );
+    virtual bool Remove( int pos );
+
+    void SetMinSize( int width, int height )
+        { DoSetMinSize( width, height ); }
+    void SetMinSize( wxSize size )
+        { DoSetMinSize( size.x, size.y ); }
+    
+    /* Searches recursively */
+    bool SetItemMinSize( wxWindow *window, int width, int height )
+        { return DoSetItemMinSize( window, width, height ); }
+    bool SetItemMinSize( wxWindow *window, wxSize size )
+        { return DoSetItemMinSize( window, size.x, size.y ); }
+        
+    /* Searches recursively */
+    bool SetItemMinSize( wxSizer *sizer, int width, int height )
+        { return DoSetItemMinSize( sizer, width, height ); }
+    bool SetItemMinSize( wxSizer *sizer, wxSize size )
+        { return DoSetItemMinSize( sizer, size.x, size.y ); }
+        
+    bool SetItemMinSize( int pos, int width, int height )
+        { return DoSetItemMinSize( pos, width, height ); }
+    bool SetItemMinSize( int pos, wxSize size )
+        { return DoSetItemMinSize( pos, size.x, size.y ); }
+        
+    wxSize GetSize()
+        { return m_size; }
+    wxPoint GetPosition()
+        { return m_position; }
+        
+    /* Calculate the minimal size or return m_minSize if bigger. */
+    wxSize GetMinSize();
+
+    virtual void RecalcSizes() = 0;
+    virtual wxSize CalcMin() = 0;
+
+    virtual void Layout();
+
+    void Fit( wxWindow *window );
+    void SetSizeHints( wxWindow *window );
+
+    wxList& GetChildren()
+        { return m_children; }
+
+    void SetDimension( int x, int y, int width, int height );

 
 

-   void SetDimension( int x, int y, int width, int height );
-
-   wxSize GetSize()
-     { return m_size; }
-   wxPoint GetPosition()
-     { return m_position; }
-   wxSize GetMinSize()
-     { return CalcMin(); }
+protected:
+    wxSize  m_size;
+    wxSize  m_minSize;
+    wxPoint m_position;
+    wxList  m_children;
+
+    wxSize GetMinWindowSize( wxWindow *window );
+    
+    virtual void DoSetMinSize( int width, int height );
+    virtual bool DoSetItemMinSize( wxWindow *window, int width, int height );
+    virtual bool DoSetItemMinSize( wxSizer *sizer, int width, int height );
+    virtual bool DoSetItemMinSize( int pos, int width, int height );
+        
+private:
+    DECLARE_CLASS(wxSizer);
+};

 
 

-   virtual void RecalcSizes() = 0;
-   virtual wxSize CalcMin() = 0;
+//---------------------------------------------------------------------------
+// wxGridSizer
+//---------------------------------------------------------------------------

 
 

-   virtual void Layout();
+class WXDLLEXPORT wxGridSizer: public wxSizer
+{
+public:
+    wxGridSizer( int rows, int cols, int vgap, int hgap );
+    wxGridSizer( int cols, int vgap = 0, int hgap = 0 );
+    
+    void RecalcSizes();
+    wxSize CalcMin();
+
+    void SetCols( int cols )    { m_cols = cols; }
+    void SetRows( int rows )    { m_rows = rows; }
+    void SetVGap( int gap )     { m_vgap = gap; }
+    void SetHGap( int gap )     { m_hgap = gap; }
+    int GetCols()               { return m_cols; }
+    int GetRows()               { return m_rows; }
+    int GetVGap()               { return m_vgap; }
+    int GetHGap()               { return m_hgap; }
+    
+protected:
+    int    m_rows;
+    int    m_cols;
+    int    m_vgap;
+    int    m_hgap;
+    
+    void SetItemBounds( wxSizerItem *item, int x, int y, int w, int h );
+    
+private:
+    DECLARE_CLASS(wxGridSizer);
+};

 
 

-   void Fit( wxWindow *window );
-   void SetSizeHints( wxWindow *window );
+//---------------------------------------------------------------------------
+// wxFlexGridSizer
+//---------------------------------------------------------------------------

 
 

-  wxList& GetChildren()
-    { return m_children; }
+class WXDLLEXPORT wxFlexGridSizer: public wxGridSizer
+{
+public:
+    wxFlexGridSizer( int rows, int cols, int vgap, int hgap );
+    wxFlexGridSizer( int cols, int vgap = 0, int hgap = 0 );
+    ~wxFlexGridSizer();
+    
+    void RecalcSizes();
+    wxSize CalcMin();
+    
+    void AddGrowableRow( size_t idx );
+    void RemoveGrowableRow( size_t idx );
+    void AddGrowableCol( size_t idx );
+    void RemoveGrowableCol( size_t idx );

 
 protected:
 
 protected:

-   wxSize  m_size;
-   wxPoint m_position;
-   wxList  m_children;
-
-   wxSize GetMinWindowSize( wxWindow *window );
+    int         *m_rowHeights;
+    int         *m_colWidths;
+    wxArrayInt  m_growableRows;
+    wxArrayInt  m_growableCols;
+    
+    void CreateArrays();
+    
+private:
+    DECLARE_CLASS(wxFlexGridSizer);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -164,15 +279,14 @@ protected:
 
 class WXDLLEXPORT wxBoxSizer: public wxSizer
 {
 
 class WXDLLEXPORT wxBoxSizer: public wxSizer
 {

-    DECLARE_CLASS(wxBoxSizer);

 public:
 public:

-   wxBoxSizer( int orient );
+    wxBoxSizer( int orient );

 
 

-   void RecalcSizes();
-   wxSize CalcMin();
+    void RecalcSizes();
+    wxSize CalcMin();

 
 

-   int GetOrientation()
-     { return m_orient; }
+    int GetOrientation()
+        { return m_orient; }

 
 protected:
     int m_orient;
 
 protected:
     int m_orient;


@@ -181,6 +295,9 @@ protected:
     int m_minHeight;
     int m_fixedWidth;
     int m_fixedHeight;
     int m_minHeight;
     int m_fixedWidth;
     int m_fixedHeight;

+    
+private:
+    DECLARE_CLASS(wxBoxSizer);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -189,18 +306,20 @@ protected:
 
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {

-    DECLARE_CLASS(wxStaticBoxSizer);

 public:
 public:

-   wxStaticBoxSizer( wxStaticBox *box, int orient );
+    wxStaticBoxSizer( wxStaticBox *box, int orient );

 
 

-   void RecalcSizes();
-   wxSize CalcMin();
+    void RecalcSizes();
+    wxSize CalcMin();

 
 

-   wxStaticBox *GetStaticBox()
-     { return m_staticBox; }
+    wxStaticBox *GetStaticBox()
+        { return m_staticBox; }

 
 protected:
 
 protected:

-   wxStaticBox   *m_staticBox;
+    wxStaticBox   *m_staticBox;
+    
+private:
+    DECLARE_CLASS(wxStaticBoxSizer);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -211,18 +330,20 @@ protected:
 
 class WXDLLEXPORT wxNotebookSizer: public wxSizer
 {
 
 class WXDLLEXPORT wxNotebookSizer: public wxSizer
 {

-    DECLARE_CLASS(wxNotebookSizer);

 public:
 public:

-   wxNotebookSizer( wxNotebook *nb );
+    wxNotebookSizer( wxNotebook *nb );

 
 

-   void RecalcSizes();
-   wxSize CalcMin();
+    void RecalcSizes();
+    wxSize CalcMin();

 
 

-   wxNotebook *GetNotebook()
-     { return m_notebook; }
+    wxNotebook *GetNotebook()
+        { return m_notebook; }

 
 protected:
 
 protected:

-   wxNotebook   *m_notebook;
+    wxNotebook   *m_notebook;
+   
+private:
+    DECLARE_CLASS(wxNotebookSizer);

 };
 
 #endif
 };
 
 #endif