Added wxCriticalSection::TryEnter() method.

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index b1046d6d5e72017957c60d1655c51eeafdbacced..514a3d30751800ca999f30a63c0234e53559b3de 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -28,13 +28,13 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
-extern WXDLLEXPORT_DATA(const char) wxStaticLineNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticLineNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxStaticLineBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl
 {
 public:
     // constructor
@@ -46,10 +46,13 @@ public:
     // get the default size for the "lesser" dimension of the static line
     static int GetDefaultSize() { return 2; }
 
-    // overriden base class virtuals
+    // overridden base class virtuals
     virtual bool AcceptsFocus() const { return false; }
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {
@@ -73,7 +76,7 @@ protected:
         return AdjustSize(wxDefaultSize);
     }
 
-    DECLARE_NO_COPY_CLASS(wxStaticLineBase)
+    wxDECLARE_NO_COPY_CLASS(wxStaticLineBase);
 };
 
 // ----------------------------------------------------------------------------
@@ -91,7 +94,7 @@ protected:
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statline.h"
+    #include "wx/osx/statline.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms