SetTextColour is gone

[wxWidgets.git] / include / wx / generic / statline.h

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 5d3dafa675de09bdde429f35c329298067a9967f..aadf1250b2646efe37e186b68e0dbeed6cb31ec9 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -11,10 +11,6 @@
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 

-#ifdef __GNUG__
-    #pragma interface
-#endif
-

 class wxStaticBox;
 
 // ----------------------------------------------------------------------------
 class wxStaticBox;
 
 // ----------------------------------------------------------------------------


@@ -27,10 +23,10 @@ class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 
 public:
     // constructors and pseudo-constructors
 
 public:
     // constructors and pseudo-constructors

-    wxStaticLine() { }
+    wxStaticLine() { m_statbox = NULL; }

 
     wxStaticLine( wxWindow *parent,
 
     wxStaticLine( wxWindow *parent,

-                  wxWindowID id,
+                  wxWindowID id = wxID_ANY,

                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,


@@ -39,8 +35,10 @@ public:
         Create(parent, id, pos, size, style, name);
     }
 
         Create(parent, id, pos, size, style, name);
     }
 

+    virtual ~wxStaticLine();
+

     bool Create( wxWindow *parent,
     bool Create( wxWindow *parent,

-                 wxWindowID id,
+                 wxWindowID id = wxID_ANY,

                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,


@@ -50,7 +48,11 @@ public:
     // will want to return the main widget for m_statbox
     //
     WXWidget GetMainWidget() const;
     // will want to return the main widget for m_statbox
     //
     WXWidget GetMainWidget() const;

-        
+
+    // override wxWindow methods to make things work
+    virtual void DoSetSize(int x, int y, int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+    virtual void DoMoveWindow(int x, int y, int width, int height);

 protected:
     // we implement the static line using a static box
     wxStaticBox *m_statbox;
 protected:
     // we implement the static line using a static box
     wxStaticBox *m_statbox;