Revert HasModifiers() change in behaviour, add HasAnyModifiers().

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 188abffa6701a04122548fb81bfa7acdff57fa83..cacae6619868380699637fd6d0eede5dcde3e1da 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,37 +1,74 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/statbox.h
+// Purpose:     wxStaticBox base header
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// RCS-ID:      $Id$
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_STATBOX_H_BASE_
 #define _WX_STATBOX_H_BASE_
 
 #ifndef _WX_STATBOX_H_BASE_
 #define _WX_STATBOX_H_BASE_
 

+#include "wx/defs.h"
+

 #if wxUSE_STATBOX
 
 #include "wx/control.h"
 
 #if wxUSE_STATBOX
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxStaticBox: a grouping box with a label
 // ----------------------------------------------------------------------------
 

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

 {
 public:
 {
 public:

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    wxStaticBoxBase() { }
+
+    // overridden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }
+    virtual bool HasTransparentBackground() { return true; }
+
+    // implementation only: this is used by wxStaticBoxSizer to account for the
+    // need for extra space taken by the static box
+    //
+    // the top border is the margin at the top (where the title is),
+    // borderOther is the margin on all other sides
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
+    {
+        const int BORDER = 5; // FIXME: hardcoded value
+
+        *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
+        *borderOther = BORDER;
+    }
+
+protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+    wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);

 };
 
 #if defined(__WXUNIVERSAL__)
 };
 
 #if defined(__WXUNIVERSAL__)

-#include "wx/univ/statbox.h"
+    #include "wx/univ/statbox.h"

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-#include "wx/msw/statbox.h"
+    #include "wx/msw/statbox.h"

 #elif defined(__WXMOTIF__)
 #elif defined(__WXMOTIF__)

-#include "wx/motif/statbox.h"
+    #include "wx/motif/statbox.h"
+#elif defined(__WXGTK20__)
+    #include "wx/gtk/statbox.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk/statbox.h"
+    #include "wx/gtk1/statbox.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/mac/statbox.h"
+    #include "wx/osx/statbox.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statbox.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/statbox.h"
-#elif defined(__WXSTUBS__)
-#include "wx/stubs/statbox.h"
+    #include "wx/os2/statbox.h"

 #endif
 
 #endif // wxUSE_STATBOX
 #endif
 
 #endif // wxUSE_STATBOX