added wxStaticCast, moved wxConstCast from wx/object.h to wx/defs.h for consistency

[wxWidgets.git] / wxPython / contrib / xrc / _xmlhandler.i

diff --git a/wxPython/contrib/xrc/_xmlhandler.i b/wxPython/contrib/xrc/_xmlhandler.i
index 3cff029c737474d50445fa7d849cf2fd438f9dbe..018d20777aef8ea58957a90d70459aa5c67122f3 100644 (file)
--- a/wxPython/contrib/xrc/_xmlhandler.i
+++ b/wxPython/contrib/xrc/_xmlhandler.i
@@ -69,7 +69,7 @@ public:
     int GetStyle(const wxString& param = wxT("style"), int defaults = 0)
         { return wxXmlResourceHandler::GetStyle(param, defaults); }
 
-    wxString GetText(const wxString& param, bool translate = TRUE)
+    wxString GetText(const wxString& param, bool translate = True)
         { return wxXmlResourceHandler::GetText(param, translate); }
 
     int GetID()
@@ -78,7 +78,7 @@ public:
     wxString GetName()
         { return wxXmlResourceHandler::GetName(); }
 
-    bool GetBool(const wxString& param, bool defaultv = FALSE)
+    bool GetBool(const wxString& param, bool defaultv = False)
         { return wxXmlResourceHandler::GetBool(param, defaultv); }
 
     long GetLong( const wxString& param, long defaultv = 0 )
@@ -112,7 +112,7 @@ public:
     void SetupWindow(wxWindow *wnd)
         { wxXmlResourceHandler::SetupWindow(wnd); }
 
-    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE)
+    void CreateChildren(wxObject *parent, bool this_hnd_only = False)
         { wxXmlResourceHandler::CreateChildren(parent, this_hnd_only); }
 
     void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL)
@@ -140,7 +140,7 @@ IMP_PYCALLBACK_BOOL_NODE_pure(wxPyXmlResourceHandler, wxXmlResourceHandler, CanH
 
 %name(XmlResourceHandler) class wxPyXmlResourceHandler : public wxObject {
 public:
-    %addtofunc wxPyXmlResourceHandler "self._setCallbackInfo(self, XmlResourceHandler)"
+    %pythonAppend wxPyXmlResourceHandler "self._setCallbackInfo(self, XmlResourceHandler)"
     wxPyXmlResourceHandler() : wxXmlResourceHandler() {}
     //~wxPyXmlResourceHandler();
 
@@ -204,7 +204,7 @@ public:
     // - replaces \n, \r, \t by respective chars (according to C syntax)
     // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
     // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param, bool translate = TRUE);
+    wxString GetText(const wxString& param, bool translate = True);
 
     // Returns the XRCID.
     int GetID();
@@ -212,8 +212,8 @@ public:
     // Returns the resource name.
     wxString GetName();
 
-    // Gets a bool flag (1, t, yes, on, true are TRUE, everything else is FALSE).
-    bool GetBool(const wxString& param, bool defaultv = FALSE);
+    // Gets a bool flag (1, t, yes, on, true are True, everything else is False).
+    bool GetBool(const wxString& param, bool defaultv = False);
 
     // Gets the integer value from the parameter.
     long GetLong( const wxString& param, long defaultv = 0 );
@@ -247,7 +247,7 @@ public:
     void SetupWindow(wxWindow *wnd);
 
     // Creates children.
-    void CreateChildren(wxObject *parent, bool this_hnd_only = FALSE);
+    void CreateChildren(wxObject *parent, bool this_hnd_only = False);
 
     // Helper function.
     void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);