#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
+
/*
* Internal format for control/panel item
*/
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; }
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;
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);