Fixed some compile errors (MSVC++ 6) and some very strange link errors when

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

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index 3f92aa78c6d342548c1929b91ac4c680df47e00d..5b8af95cdb26bbd46509ea19db8d709190f33316 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        sizer.h

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

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


@@ -26,61 +26,79 @@
 // classes
 //---------------------------------------------------------------------------
 
 // classes
 //---------------------------------------------------------------------------
 

-class wxNewSizerItem;
-class wxNewSizer;
-class wxBoxNewSizer;
+class wxStaticBox;
+
+class wxSizerItem;
+class wxSizer;
+class wxBoxSizer;
+class wxStaticBoxSizer;

 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------

-// wxNewSizerItem
+// wxSizerItem

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

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

 {
 public:
   // spacer
 {
 public:
   // spacer

-  wxNewSizerItem( int width, int height, int option );
+  wxSizerItem( int width, int height, int option, int flag, int border );

 
   // window
 
   // window

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

 
   // subsizer
 
   // subsizer

-  wxNewSizerItem( wxNewSizer *sizer, int option );
+  wxSizerItem( wxSizer *sizer, int option, int flag, int border );

 
   virtual wxSize GetSize();
   virtual wxSize CalcMin();
   virtual void SetDimension( wxPoint pos, wxSize size );
   
   bool IsWindow();
 
   virtual wxSize GetSize();
   virtual wxSize CalcMin();
   virtual void SetDimension( wxPoint pos, wxSize size );
   
   bool IsWindow();

-  bool IsNewSizer();
+  bool IsSizer();

   bool IsSpacer();
   
   wxWindow *GetWindow() const  
     { return m_window; }
   bool IsSpacer();
   
   wxWindow *GetWindow() const  
     { return m_window; }

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

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

+  int GetFlag() const
+    { return m_flag; }
+  int GetBorder() const
+    { return m_border; }

   
 protected:
   wxWindow    *m_window;
   
 protected:
   wxWindow    *m_window;

-  wxNewSizer     *m_sizer;
+  wxSizer     *m_sizer;
+  wxSize       m_size;

   wxSize       m_minSize;
   int          m_option;
   wxSize       m_minSize;
   int          m_option;

+  int          m_border;
+  int          m_flag;

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

-// wxNewSizer
+// wxSizer

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-   wxNewSizer();
-   ~wxNewSizer();
+   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 Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0 );
+   virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0 );
+   virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0  );

    
    

-   virtual void Add( wxWindow *window, int option = 0 );
-   virtual void Add( wxNewSizer *sizer, int option = 0  );
-   virtual void Add( int width, int height, int option = 0  );
+   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 );
   


@@ -108,34 +126,47 @@ protected:
 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------

-// wxBorderNewSizer
+// wxBoxSizer

 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 

-#define wxWEST  wxLEFT
-#define wxEAST  wxRIGHT
-#define wxNORTH wxUP
-#define wxSOUTH wxDOWN
-#define wxALL_DIRECTIONS (wxNORTH | wxSOUTH | wxEAST | wxWEST)
-
-class WXDLLEXPORT wxBorderNewSizer: public wxNewSizer
+class WXDLLEXPORT wxBoxSizer: public wxSizer

 {
 public:
 {
 public:

-   wxBorderNewSizer( int sides = wxALL_DIRECTIONS );
-   
-   virtual void Add( wxWindow *window, int option = 10 );
-   virtual void Add( wxNewSizer *sizer, int option = 10 );
-   virtual void Add( int width, int height, int option = 10 );
+   wxBoxSizer( int orient );

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

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

    
 protected:
    
 protected:

-   int    m_sides;
+    int m_orient;
+    int m_stretchable;
+    int m_minWidth;
+    int m_minHeight;
+    int m_fixedWidth;
+    int m_fixedHeight;

 };
   
 };
   

+//---------------------------------------------------------------------------
+// wxStaticBoxSizer
+//---------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
+{
+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__