Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/msw/statline.h b/include/wx/msw/statline.h
index 9fe6273bcbd393576608a028cceffcfd96351021..1efded8febee101b9bd7fbc3839c9b4c0d6e6a00 100644 (file)
--- a/include/wx/msw/statline.h
+++ b/include/wx/msw/statline.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/statline.h
+// Name:        wx/msw/statline.h

 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     MSW version of wxStaticLine class
 // Author:      Vadim Zeitlin
 // Created:     28.06.99


@@ -11,41 +11,40 @@
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 
 #ifndef _WX_MSW_STATLINE_H_
 #define _WX_MSW_STATLINE_H_
 

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

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

-class WXDLLEXPORT wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE 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,
                   long style = wxLI_HORIZONTAL,

-                  const wxString &name = wxStaticTextNameStr )
+                  const wxString &name = wxStaticLineNameStr )

     {
         Create(parent, id, pos, size, style, name);
     }
 
     bool Create( wxWindow *parent,
     {
         Create(parent, id, pos, size, style, name);
     }
 
     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,
                  long style = wxLI_HORIZONTAL,

-                 const wxString &name = wxStaticTextNameStr );
+                 const wxString &name = wxStaticLineNameStr );
+
+    // overridden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }
+
+    // usually overridden base class virtuals
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticLine)

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