Committing in .

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

diff --git a/include/wx/statline.h b/include/wx/statline.h
index a5657107a5370edc57debecf996e73716c77c828..f660c5d94365d0d5bfd6bb7676f3555479a203ba 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_
 
 #ifndef _WX_STATLINE_H_BASE_
 #define _WX_STATLINE_H_BASE_
 


@@ -36,9 +46,12 @@ 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; }
+

 protected:
     // set the right size for the right dimension
 protected:
     // set the right size for the right dimension

-    wxSize AdjustSize(const wxSize& size)
+    wxSize AdjustSize(const wxSize& size) const

     {
         wxSize sizeReal(size);
         if ( IsVertical() )
     {
         wxSize sizeReal(size);
         if ( IsVertical() )


@@ -54,13 +67,20 @@ protected:
 
         return sizeReal;
     }
 
         return sizeReal;
     }

+
+    virtual wxSize DoGetBestSize() const
+    {
+        return AdjustSize(wxDefaultSize);
+    }

 };
 
 // ----------------------------------------------------------------------------
 // now include the actual class declaration
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // 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__)
     #include "wx/gtk/statline.h"
     #include "wx/msw/statline.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statline.h"