added wxTo/FromString() overloads for wxFont (1st part of patch 1760073)

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

diff --git a/include/wx/os2/statline.h b/include/wx/os2/statline.h
index a0142e87b61625c346cb25de9306f6c1bd16440b..76625e51ca8b1d743048fef5a14524e8b86515ea 100644 (file)
--- a/include/wx/os2/statline.h
+++ b/include/wx/os2/statline.h
@@ -11,10 +11,6 @@
 #ifndef _WX_OS2_STATLINE_H_
 #define _WX_OS2_STATLINE_H_
 
-#ifdef __GNUG__
-    #pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
@@ -26,22 +22,22 @@ 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 wxString& rsName = wxStaticTextNameStr
+                 ,const wxString& rsName = wxStaticLineNameStr
                 )
     {
         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 wxString& rsName = wxStaticTextNameStr
+                 ,const wxString& rsName = wxStaticLineNameStr
                 );
 
     inline bool          IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); }
@@ -74,6 +70,13 @@ protected:
 
     inline wxSize DoGetBestSize(void) const { return (AdjustSize(wxDefaultSize)); }
 
+    //
+    // Usually overridden base class virtuals
+    //
+    virtual WXDWORD OS2GetStyle( long     lStyle
+                                ,WXDWORD* pdwExstyle
+                               ) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
 }; // end of CLASS wxStaticLine