use virtual size for the size of the buffer when wxBUFFER_VIRTUAL_AREA style is used

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 41d29b05b90a97b9db1be5996085dfe40f822e87..efeeee65b21f8f6ff4631148ef43ccc3ad4731c8 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,11 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        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"
 

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

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


@@ -27,7 +40,7 @@ public:
     // borderOther is the margin on all other sides
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
     {
     // borderOther is the margin on all other sides
     virtual void GetBordersForSizer(int *borderTop, int *borderOther) const
     {

-        static const int BORDER = 5; // FIXME: hardcoded value
+        const int BORDER = 5; // FIXME: hardcoded value

 
         *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
         *borderOther = BORDER;
 
         *borderTop = GetLabel().empty() ? BORDER : GetCharHeight();
         *borderOther = BORDER;


@@ -43,8 +56,10 @@ private:
     #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbox.h"
     #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbox.h"

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

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

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

 #elif defined(__WXMAC__)
     #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/statbox.h"
 #elif defined(__WXCOCOA__)