Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 61eda2e4ecb47ac1854b38c74b436f8734c339b1..091a17db7981d777ce0f4324afb1d3ff01942fc7 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


@@ -27,6 +27,7 @@
 //---------------------------------------------------------------------------
 
 class wxStaticBox;
 //---------------------------------------------------------------------------
 
 class wxStaticBox;

+class wxNotebook;

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


@@ -39,27 +40,48 @@ class wxStaticBoxSizer;
 
 class WXDLLEXPORT wxSizerItem: public wxObject
 {
 
 class WXDLLEXPORT wxSizerItem: public wxObject
 {

+    DECLARE_CLASS(wxSizerItem);

 public:
   // spacer
 public:
   // spacer

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

 
   // window
 
   // window

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

 
   // subsizer
 
   // subsizer

-  wxSizerItem( wxSizer *sizer, int option, int flag, int border );
+  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 );
 
   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();
   
   bool IsWindow();
   bool IsSizer();
   bool IsSpacer();
   

-  wxWindow *GetWindow() const  
+  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; }
     { 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; }


@@ -67,7 +89,9 @@ public:
     { return m_flag; }
   int GetBorder() const
     { return m_border; }
     { return m_flag; }
   int GetBorder() const
     { return m_border; }

-  
+  wxObject* GetUserData()
+    { return m_userData; }
+

 protected:
   wxWindow    *m_window;
   wxSizer     *m_sizer;
 protected:
   wxWindow    *m_window;
   wxSizer     *m_sizer;


@@ -76,6 +100,11 @@ protected:
   int          m_option;
   int          m_border;
   int          m_flag;
   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;

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


@@ -84,16 +113,29 @@ protected:
 
 class WXDLLEXPORT wxSizer: public wxObject
 {
 
 class WXDLLEXPORT wxSizer: public wxObject
 {

+    DECLARE_CLASS(wxSizer);

 public:
    wxSizer();
    ~wxSizer();
 public:
    wxSizer();
    ~wxSizer();

-   
-   virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0 );
-   virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0 );
-   virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0  );
-  
+
+   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 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()
    wxSize GetSize()
      { return m_size; }
    wxPoint GetPosition()


@@ -103,17 +145,20 @@ public:
 
    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 );
    virtual void Layout();
 
    void Fit( wxWindow *window );
    void SetSizeHints( wxWindow *window );

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

 protected:
    wxSize  m_size;
    wxPoint m_position;
    wxList  m_children;
 protected:
    wxSize  m_size;
    wxPoint m_position;
    wxList  m_children;

-   
+

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


@@ -123,15 +168,16 @@ protected:
 
 class WXDLLEXPORT wxBoxSizer: public wxSizer
 {
 
 class WXDLLEXPORT wxBoxSizer: public wxSizer
 {

+    DECLARE_CLASS(wxBoxSizer);

 public:
    wxBoxSizer( int orient );
 public:
    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;
     int m_stretchable;
 protected:
     int m_orient;
     int m_stretchable;


@@ -140,25 +186,51 @@ protected:
     int m_fixedWidth;
     int m_fixedHeight;
 };
     int m_fixedWidth;
     int m_fixedHeight;
 };

-  
+

 //---------------------------------------------------------------------------
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {
 //---------------------------------------------------------------------------
 // wxStaticBoxSizer
 //---------------------------------------------------------------------------
 
 class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
 {

+    DECLARE_CLASS(wxStaticBoxSizer);

 public:
    wxStaticBoxSizer( wxStaticBox *box, int orient );
 public:
    wxStaticBoxSizer( wxStaticBox *box, int orient );

-   
+

    void RecalcSizes();
    wxSize CalcMin();
    void RecalcSizes();
    wxSize CalcMin();

-   
+

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

-   
+

 protected:
    wxStaticBox   *m_staticBox;
 };
 
 protected:
    wxStaticBox   *m_staticBox;
 };
 

+//---------------------------------------------------------------------------
+// wxNotebookSizer
+//---------------------------------------------------------------------------
+
+#if wxUSE_NOTEBOOK
+
+class WXDLLEXPORT wxNotebookSizer: public wxSizer
+{
+    DECLARE_CLASS(wxNotebookSizer);
+public:
+   wxNotebookSizer( wxNotebook *nb );
+
+   void RecalcSizes();
+   wxSize CalcMin();
+
+   wxNotebook *GetNotebook()
+     { return m_notebook; }
+
+protected:
+   wxNotebook   *m_notebook;
+};
+
+#endif
+
+

 #endif
   // __WXSIZER_H__
 #endif
   // __WXSIZER_H__