* Some more CopyObject()

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

diff --git a/include/wx/resource.h b/include/wx/resource.h
index 0b0357e55456b56623eff7bbf2eb1336d4f0fa4d..7e1f825e0ff453ad753e7a85a7231daf456ded92 100644 (file)
--- a/include/wx/resource.h
+++ b/include/wx/resource.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_RESOURCEH__
@@ -42,16 +42,20 @@
 #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
  */
- 
+
 class WXDLLEXPORT wxItemResource: public wxObject
 {
   DECLARE_DYNAMIC_CLASS(wxItemResource)
 
  public:
- 
+
   wxItemResource();
   ~wxItemResource();
 
@@ -73,14 +77,14 @@ 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; }