Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index f660c5d94365d0d5bfd6bb7676f3555479a203ba..4f9e0f15611e6f86fce77982ab7c7f5e51c27d05 100644 (file)
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -3,7 +3,6 @@
 // Purpose:     wxStaticLine class interface
 // Author:      Vadim Zeitlin
 // Created:     28.06.99
 // Purpose:     wxStaticLine class interface
 // Author:      Vadim Zeitlin
 // Created:     28.06.99

-// Version:     $Id$

 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -28,13 +27,13 @@
 // ----------------------------------------------------------------------------
 
 // the default name for objects of class wxStaticLine
 // ----------------------------------------------------------------------------
 
 // 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
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStaticLine - a line in a dialog
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStaticLineBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticLineBase : public wxControl

 {
 public:
     // constructor
 {
 public:
     // constructor


@@ -46,22 +45,25 @@ public:
     // get the default size for the "lesser" dimension of the static line
     static int GetDefaultSize() { return 2; }
 
     // 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; }
+    // overridden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }

 
 protected:
 
 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
     {
         wxSize sizeReal(size);
         if ( IsVertical() )
         {
     // set the right size for the right dimension
     wxSize AdjustSize(const wxSize& size) const
     {
         wxSize sizeReal(size);
         if ( IsVertical() )
         {

-            if ( size.x == -1 )
+            if ( size.x == wxDefaultCoord )

                 sizeReal.x = GetDefaultSize();
         }
         else
         {
                 sizeReal.x = GetDefaultSize();
         }
         else
         {

-            if ( size.y == -1 )
+            if ( size.y == wxDefaultCoord )

                 sizeReal.y = GetDefaultSize();
         }
 
                 sizeReal.y = GetDefaultSize();
         }
 


@@ -72,6 +74,8 @@ protected:
     {
         return AdjustSize(wxDefaultSize);
     }
     {
         return AdjustSize(wxDefaultSize);
     }

+
+    wxDECLARE_NO_COPY_CLASS(wxStaticLineBase);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -82,17 +86,20 @@ protected:
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"
     #include "wx/univ/statline.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/statline.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/statline.h"
     #include "wx/gtk/statline.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statline.h"

 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
 #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
     #include "wx/generic/statline.h"
 #endif
 
 #endif // wxUSE_STATLINE
 
 #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_