X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dd070c25bd91c12380f9aeada27a2b7b64ed1d7..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/statbox.h?ds=sidebyside diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 41d29b05b9..efeeee65b2 100644 --- 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_ +#include "wx/defs.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 @@ -27,7 +40,7 @@ public: // 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; @@ -43,8 +56,10 @@ private: #include "wx/msw/statbox.h" #elif defined(__WXMOTIF__) #include "wx/motif/statbox.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/statbox.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/statbox.h" #elif defined(__WXMAC__) #include "wx/mac/statbox.h" #elif defined(__WXCOCOA__)