fixed library order (important for static linking under Unix

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

diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 0b4b2d8341a11157559bed359ddfe38d77cab9a4..6422b1c06a8b734b7eb310afed246484a837d814 100644 (file)
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -11,7 +11,7 @@
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface
 #endif
 
     #pragma interface
 #endif
 


@@ -21,16 +21,14 @@
 
 class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {
 
 class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-

 public:
     // constructors and pseudo-constructors
     wxStaticLine() { }
 
     wxStaticLine( wxWindow *parent,
 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 )
     {
                   long style = wxLI_HORIZONTAL,
                   const wxString &name = wxStaticTextNameStr )
     {


@@ -38,11 +36,20 @@ public:
     }
 
     bool Create( wxWindow *parent,
     }
 
     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 );
                  long style = wxLI_HORIZONTAL,
                  const wxString &name = wxStaticTextNameStr );

+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }
+
+protected:
+    // usually overridden base class virtuals
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine)

 };
 
 #endif // _WX_MSW_STATLINE_H_
 };
 
 #endif // _WX_MSW_STATLINE_H_