test complete :-)

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 417cb9d9811e46c3be92d90c1b9dc76f87f77b1f..c8e4503f515550508e8fe36174b4441d577b39a6 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.h

-// Purpose:     provide wxSizer class for layounting
+// Purpose:     provide wxSizer class for layouting

 // Author:      Robert Roebling and Robin Dunn
 // Modified by:
 // Author:      Robert Roebling and Robin Dunn
 // Modified by:

-// Created:     
+// Created:

 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn, Dirk Holtwick and Robert Roebling
 // Licence:     wxWindows licence
 // RCS-ID:      $Id$
 // Copyright:   (c) Robin Dunn, Dirk Holtwick and Robert Roebling
 // Licence:     wxWindows licence


@@ -26,84 +26,172 @@
 // classes
 //---------------------------------------------------------------------------
 
 // classes
 //---------------------------------------------------------------------------
 

+class wxStaticBox;
+

 class wxSizerItem;
 class wxSizer;
 class wxBoxSizer;
 class wxSizerItem;
 class wxSizer;
 class wxBoxSizer;

+class wxStaticBoxSizer;

 
 //---------------------------------------------------------------------------
 // wxSizerItem
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 // wxSizerItem
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSizerItem: wxObject
+class WXDLLEXPORT wxSizerItem: public wxObject

 {
 {

+    DECLARE_CLASS(wxSizerItem);

 public:
   // spacer
 public:
   // spacer

-  wxSizerItem( int width, int height, int option )
+  wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);

 
   // window
 
   // window

-  wxSizerItem( wxWindow *window, int option );
+  wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );

 
   // subsizer
 
   // subsizer

-  wxSizerItem( wxSizer *sizer, int option );
+  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; }

 
 

-  virtual wxSize GetMinSize();
-  

   bool IsWindow();
   bool IsSizer();
   bool IsSpacer();
   bool IsWindow();
   bool IsSizer();
   bool IsSpacer();

-  
-  wxWindow *GetWindow() const  
+
+  wxWindow *GetWindow() const

     { return m_window; }
     { return m_window; }

-  wxSizer *GetSizer() const    
+  wxSizer *GetSizer() const

     { return m_sizer; }
   int GetOption() const
     { return m_option; }
     { return m_sizer; }
   int GetOption() const
     { return m_option; }

-  
-private:
+  int GetFlag() const
+    { return m_flag; }
+  int GetBorder() const
+    { return m_border; }
+  wxObject* GetUserData()
+    { return m_userData; }
+
+protected:

   wxWindow    *m_window;
   wxSizer     *m_sizer;
   wxWindow    *m_window;
   wxSizer     *m_sizer;

+  wxSize       m_size;

   wxSize       m_minSize;
   int          m_option;
   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;
+};

 
 //---------------------------------------------------------------------------
 // wxSizer
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 // wxSizer
 //---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSizer: wxObject
+class WXDLLEXPORT wxSizer: public wxObject

 {
 {

+    DECLARE_CLASS(wxSizer);

 public:
 public:

-   wxSizer()
-   ~wxSizer()
-   
-   virtual void Add( wxWindow *window, int option = 0 );
-   virtual void Add( wxSizer *sizer, int option = 0  );
-   virtual void Add( int width, int height, int option = 0  );
-  
-   void SetDimension( int x, int y, int width, int height )
-     { DoSetDimension( x, y, width, height ); }
-  
+   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 );
+
+   void SetDimension( int x, int y, int width, int height );
+

    wxSize GetSize()
      { return m_size; }
    wxPoint GetPosition()
      { return m_position; }
    wxSize GetMinSize()
      { return CalcMin(); }
    wxSize GetSize()
      { return m_size; }
    wxPoint GetPosition()
      { return m_position; }
    wxSize GetMinSize()
      { return CalcMin(); }

-     
+

    virtual void RecalcSizes() = 0;
    virtual wxSize CalcMin() = 0;
 
    virtual void RecalcSizes() = 0;
    virtual wxSize CalcMin() = 0;
 

+   virtual void Layout();
+

    void Fit( wxWindow *window );
    void SetSizeHints( wxWindow *window );
    void Fit( wxWindow *window );
    void SetSizeHints( wxWindow *window );

-   
-private:
+
+  wxList& GetChildren()
+    { return m_children; }
+
+protected:

    wxSize  m_size;
    wxPoint m_position;
    wxList  m_children;
    wxSize  m_size;
    wxPoint m_position;
    wxList  m_children;

-   
+

    wxSize GetMinWindowSize( wxWindow *window );
    wxSize GetMinWindowSize( wxWindow *window );

-   virtual void DoSetDimension( int x, int y, int width, int height );
-}
+};
+
+//---------------------------------------------------------------------------
+// wxBoxSizer
+//---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxBoxSizer: public wxSizer
+{
+    DECLARE_CLASS(wxBoxSizer);
+public:
+   wxBoxSizer( int orient );
+
+   void RecalcSizes();
+   wxSize CalcMin();
+
+   int GetOrientation()
+     { return m_orient; }
+
+protected:
+    int m_orient;
+    int m_stretchable;
+    int m_minWidth;
+    int m_minHeight;
+    int m_fixedWidth;
+    int m_fixedHeight;
+};
+
+//---------------------------------------------------------------------------
+// wxStaticBoxSizer
+//---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
+{
+    DECLARE_CLASS(wxStaticBoxSizer);
+public:
+   wxStaticBoxSizer( wxStaticBox *box, int orient );
+
+   void RecalcSizes();
+   wxSize CalcMin();
+
+   wxStaticBox *GetStaticBox()
+     { return m_staticBox; }
+
+protected:
+   wxStaticBox   *m_staticBox;
+};

 
 #endif
   // __WXSIZER_H__
 
 #endif
   // __WXSIZER_H__