OSX reshuffling

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index 9c7fe86788c1cedafbe8902ea9dbe265ddf2b3e2..9cdd7ffd2e8e726efc1bc3590ff47260150944e2 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -1,3 +1,13 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/statline.h
+// Purpose:     wxStaticLine class interface
+// Author:      Vadim Zeitlin
+// Created:     28.06.99
+// Version:     $Id$
+// Copyright:   (c) 1999 Vadim Zeitlin
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_STATLINE_H_BASE_
 #define _WX_STATLINE_H_BASE_
 
@@ -18,13 +28,13 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticTextNameStr;
+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
@@ -36,39 +46,61 @@ public:
     // get the default size for the "lesser" dimension of the static line
     static int GetDefaultSize() { return 2; }
 
+    // overriden 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)
+    wxSize AdjustSize(const wxSize& size) const
     {
         wxSize sizeReal(size);
         if ( IsVertical() )
         {
-            if ( size.x == -1 )
+            if ( size.x == wxDefaultCoord )
                 sizeReal.x = GetDefaultSize();
         }
         else
         {
-            if ( size.y == -1 )
+            if ( size.y == wxDefaultCoord )
                 sizeReal.y = GetDefaultSize();
         }
 
         return sizeReal;
     }
+
+    virtual wxSize DoGetBestSize() const
+    {
+        return AdjustSize(wxDefaultSize);
+    }
+
+    DECLARE_NO_COPY_CLASS(wxStaticLineBase)
 };
 
 // ----------------------------------------------------------------------------
 // now include the actual class declaration
 // ----------------------------------------------------------------------------
 
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+    #include "wx/univ/statline.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/statline.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/statline.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/statline.h"
+#elif defined(__WXMAC__)
+    #include "wx/osx/statline.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms
     #include "wx/generic/statline.h"
 #endif
 
 #endif // wxUSE_STATLINE
 
-#endif
-    // _WX_STATLINE_H_BASE_
+#endif // _WX_STATLINE_H_BASE_