Add wxDataFormat GetMatchingPair() which wxGTK and wxMSW already had under different...

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

diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h
index 3b2ff75484fc1b81eb22896010379e216885ea11..617e4ddf2e9138ddb17ae1212809e00075e3720c 100644 (file)
--- a/include/wx/os2/statline.h
+++ b/include/wx/os2/statline.h
@@ -11,37 +11,33 @@
 #ifndef _WX_OS2_STATLINE_H_
 #define _WX_OS2_STATLINE_H_
 
 #ifndef _WX_OS2_STATLINE_H_
 #define _WX_OS2_STATLINE_H_
 

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

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

-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase

 {
 
 public:
     // constructors and pseudo-constructors
     wxStaticLine() { }
     wxStaticLine( wxWindow*       pParent
 {
 
 public:
     // constructors and pseudo-constructors
     wxStaticLine() { }
     wxStaticLine( wxWindow*       pParent

-                 ,wxWindowID      vId
+                 ,wxWindowID      vId = wxID_ANY

                  ,const wxPoint&  rPos = wxDefaultPosition
                  ,const wxSize&   rSize = wxDefaultSize
                  ,long            lStyle = wxLI_HORIZONTAL
                  ,const wxPoint&  rPos = wxDefaultPosition
                  ,const wxSize&   rSize = wxDefaultSize
                  ,long            lStyle = wxLI_HORIZONTAL

-                 ,const wxString& rsName = wxStaticTextNameStr
+                 ,const wxString& rsName = wxStaticLineNameStr

                 )
     {
         Create(pParent, vId, rPos, rSize, lStyle, rsName);
     }
 
     bool Create(  wxWindow*       pParent
                 )
     {
         Create(pParent, vId, rPos, rSize, lStyle, rsName);
     }
 
     bool Create(  wxWindow*       pParent

-                 ,wxWindowID      vId
+                 ,wxWindowID      vId = wxID_ANY

                  ,const wxPoint&  rPos = wxDefaultPosition
                  ,const wxSize&   rSize = wxDefaultSize
                  ,long            lStyle = wxLI_HORIZONTAL
                  ,const wxPoint&  rPos = wxDefaultPosition
                  ,const wxSize&   rSize = wxDefaultSize
                  ,long            lStyle = wxLI_HORIZONTAL

-                 ,const wxString& rsName = wxStaticTextNameStr
+                 ,const wxString& rsName = wxStaticLineNameStr

                 );
 
     inline bool          IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); }
                 );
 
     inline bool          IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); }