reverted

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

diff --git a/include/wx/generic/statline.h b/include/wx/generic/statline.h
index 0058ddede8e17e22ff3d5215e19497741e2887aa..5e5b13c24f91518388f5dca1ff55a6621ff0992e 100644 (file)
--- a/include/wx/generic/statline.h
+++ b/include/wx/generic/statline.h
@@ -11,10 +11,12 @@
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 
 #ifndef _WX_GENERIC_STATLINE_H_
 #define _WX_GENERIC_STATLINE_H_
 

-#ifdef __GNUG__
-    #pragma interface
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "statline.h"

 #endif
 
 #endif
 

+class wxStaticBox;
+

 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------


@@ -25,7 +27,7 @@ class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 
 public:
     // constructors and pseudo-constructors
 
 public:
     // constructors and pseudo-constructors

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

 
     wxStaticLine( wxWindow *parent,
                   wxWindowID id,
 
     wxStaticLine( wxWindow *parent,
                   wxWindowID id,


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

+    virtual ~wxStaticLine();
+

     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxPoint &pos = wxDefaultPosition,
     bool Create( wxWindow *parent,
                  wxWindowID id,
                  const wxPoint &pos = wxDefaultPosition,


@@ -44,6 +48,15 @@ public:
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticTextNameStr );
 
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticTextNameStr );
 

+    // it's necessary to override this wxWindow function because we
+    // 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;