correct access for virtuals, unneeded includes

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

diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 9fe6273bcbd393576608a028cceffcfd96351021..48ba88254d1117a92aa3fe7f3ea6807b6d75997b 100644 (file)
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -11,26 +11,20 @@
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 
-#ifdef __GNUG__
-    #pragma interface
-#endif
-
 // ----------------------------------------------------------------------------
 // wxStaticLine
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-
 public:
     // constructors and pseudo-constructors
     wxStaticLine() { }
 
     wxStaticLine( wxWindow *parent,
-                  wxWindowID id,
-                  const wxPoint &pos = wxDefaultPosition,
-                  const wxSize &size = wxDefaultSize,
+                  wxWindowID id = wxID_ANY,
+                  const wxPoint& pos = wxDefaultPosition,
+                  const wxSize& size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString &name = wxStaticTextNameStr )
     {
@@ -38,14 +32,19 @@ public:
     }
 
     bool Create( wxWindow *parent,
-                 wxWindowID id,
-                 const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticTextNameStr );
 
     // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
+
+    // usually overridden base class virtuals
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine)
 };
 
 #endif // _WX_MSW_STATLINE_H_