use wxString, not wxChar*, in wxDataFormat ctor and SetId() method

[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..53e95d10841a3cd91f0e3fad02752fd36d83dd20 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_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "statline.h"
-#endif
-
 class wxStaticBox;
 
 // ----------------------------------------------------------------------------
@@ -23,38 +19,38 @@ class wxStaticBox;
 
 class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-
 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 wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )
         : m_statbox(NULL)
     {
         Create(parent, id, pos, size, style, name);
     }
 
     bool Create( wxWindow *parent,
-                 wxWindowID id,
+                 wxWindowID id = wxID_ANY,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxStaticLineNameStr );
 
     // it's necessary to override this wxWindow function because we
     // 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;
+
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)
 };
 
 #endif // _WX_GENERIC_STATLINE_H_