tons of wxFTP fixes and compilation fix for wxBase

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

diff --git a/include/wx/resource.h b/include/wx/resource.h
index 937bc47b7f05b7a63035c6f7ab51269c9ee8760d..34f282c7770bd446db4ab3910db669b24c64d2cc 100644 (file)
--- a/include/wx/resource.h
+++ b/include/wx/resource.h
@@ -19,6 +19,8 @@
 #include "wx/setup.h"
 
 #if wxUSE_WX_RESOURCES
 #include "wx/setup.h"
 
 #if wxUSE_WX_RESOURCES

+
+#include "wx/bitmap.h"

 #include <stdio.h>
 
 // A few further types not in wx_types.h
 #include <stdio.h>
 
 // A few further types not in wx_types.h


@@ -34,9 +36,13 @@
 // Extended styles: for resource usage only
 
 // Use dialog units instead of pixels
 // Extended styles: for resource usage only
 
 // Use dialog units instead of pixels

-#define wxRESOURCE_DIALOG_UNITS 1
+#define wxRESOURCE_DIALOG_UNITS     0x0001

 // Use default system colour and font
 // Use default system colour and font

-#define wxRESOURCE_USE_DEFAULTS 2
+#define wxRESOURCE_USE_DEFAULTS     0x0002
+// Old-style vertical label
+#define wxRESOURCE_VERTICAL_LABEL   0x0004
+// Old-style horizontal label
+#define wxRESOURCE_HORIZONTAL_LABEL 0x0008

 
 // Macros to help use dialog units
 #define wxDLG_POINT(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxPoint(x, y)) : wxPoint(x, y))
 
 // Macros to help use dialog units
 #define wxDLG_POINT(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxPoint(x, y)) : wxPoint(x, y))