X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4765d335f603c29f1fd300288ff1d40a118fcf0e..988a8d440e98d86557c6a6393ee20bbca65bfe6f:/include/wx/resource.h?ds=sidebyside diff --git a/include/wx/resource.h b/include/wx/resource.h index 937bc47b7f..8eec715169 100644 --- a/include/wx/resource.h +++ b/include/wx/resource.h @@ -19,6 +19,8 @@ #include "wx/setup.h" #if wxUSE_WX_RESOURCES + +#include "wx/bitmap.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 -#define wxRESOURCE_DIALOG_UNITS 1 +#define wxRESOURCE_DIALOG_UNITS 0x0001 // 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)) @@ -46,6 +52,8 @@ #undef FindResource #endif +class WXDLLEXPORT wxInputStream; + /* * Internal format for control/panel item */ @@ -147,7 +155,7 @@ class WXDLLEXPORT wxResourceTable: public wxHashTable virtual bool DeleteResource(const wxString& name); virtual bool ParseResourceFile(const wxString& filename); - virtual bool ParseResourceFile( wxInputStream *is ) ; + virtual bool ParseResourceFile(wxInputStream *is); virtual bool ParseResourceData(const wxString& data); virtual bool SaveResource(const wxString& filename);