Wine fixes

[wxWidgets.git] / include / wx / mac / carbon / statline.h

diff --git a/include/wx/mac/carbon/statline.h b/include/wx/mac/carbon/statline.h
index 911e9f535c3910012a631e2169642cc27a129a62..7a70d0d5820f3e8b4eef35cff823f99f3ab82889 100644 (file)
--- a/include/wx/mac/carbon/statline.h
+++ b/include/wx/mac/carbon/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_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statline.h"
-#endif
-

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


@@ -23,14 +19,12 @@ class wxStaticBox;
 
 class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {
 
 class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-

 public:
     // constructors and pseudo-constructors
     wxStaticLine() : m_statbox(NULL) { }
 
     wxStaticLine( wxWindow *parent,
 public:
     // constructors and pseudo-constructors
     wxStaticLine() : m_statbox(NULL) { }
 
     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,


@@ -41,7 +35,7 @@ public:
     }
 
     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,


@@ -51,10 +45,12 @@ 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;

-        
+

 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;

+
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)

 };
 
 #endif // _WX_GENERIC_STATLINE_H_
 };
 
 #endif // _WX_GENERIC_STATLINE_H_