projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made GetRowCount() return size_t to avoid signed/unsigned warnings
[wxWidgets.git]
/
include
/
wx
/
statbox.h
diff --git
a/include/wx/statbox.h
b/include/wx/statbox.h
index aea08aca5efb4727f4ff730e30c46bb51e422c6f..efeeee65b21f8f6ff4631148ef43ccc3ad4731c8 100644
(file)
--- a/
include/wx/statbox.h
+++ b/
include/wx/statbox.h
@@
-18,7
+18,7
@@
#include "wx/control.h"
#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
@@
-56,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(__WXGTK
20
__)
#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__)