X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6f6393c3f42fc0d14b6815fb7a4cf5549b53501..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/include/wx/resource.h diff --git a/include/wx/resource.h b/include/wx/resource.h index 347386024c..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 // A few further types not in wx_types.h @@ -34,14 +36,24 @@ // 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)) #define wxDLG_SIZE(x, y, parent, useDlgUnits) (useDlgUnits ? parent->ConvertDialogToPixel(wxSize(x, y)) : wxSize(x, y)) +#ifdef FindResource +#undef FindResource +#endif + +class WXDLLEXPORT wxInputStream; + /* * Internal format for control/panel item */ @@ -73,21 +85,21 @@ class WXDLLEXPORT wxItemResource: public wxObject inline void SetValue4(const wxString& v) { m_value4 = v; } inline void SetStringValues(const wxStringList& svalues) { m_stringValues = svalues; } - inline wxString GetType() const { return m_itemType; } + inline const wxString& GetType() const { return m_itemType; } inline int GetX() const { return m_x; } inline int GetY() const { return m_y; } inline int GetWidth() const { return m_width; } inline int GetHeight() const { return m_height; } - inline wxString GetTitle() const { return m_title; } - inline wxString GetName() const { return m_name; } + inline const wxString& GetTitle() const { return m_title; } + inline const wxString& GetName() const { return m_name; } inline long GetStyle() const { return m_windowStyle; } inline int GetId() const { return m_windowId; } - inline long GetValue1() const { return m_value1; } - inline long GetValue2() const { return m_value2; } - inline long GetValue3() const { return m_value3; } - inline long GetValue5() const { return m_value5; } + inline wxInt32 GetValue1() const { return m_value1; } + inline wxInt32 GetValue2() const { return m_value2; } + inline wxInt32 GetValue3() const { return m_value3; } + inline wxInt32 GetValue5() const { return m_value5; } inline wxString GetValue4() const { return m_value4; } inline wxList& GetChildren() const { return (wxList&) m_children; } inline wxStringList& GetStringValues() const { return (wxStringList&) m_stringValues; } @@ -101,7 +113,7 @@ class WXDLLEXPORT wxItemResource: public wxObject inline wxColour& GetButtonColour() const { return (wxColour&) m_buttonColour; } inline void SetResourceStyle(long style) { m_exStyle = style; } - inline long GetResourceStyle() const { return m_exStyle; } + inline wxInt32 GetResourceStyle() const { return m_exStyle; } protected: wxList m_children; @@ -143,6 +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 ParseResourceData(const wxString& data); virtual bool SaveResource(const wxString& filename);