X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..5444f3a9445fe30633aef827154ed57656273a35:/wxPython/src/_statctrls.i

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index 6560372c75..6ada254ec4 100644
--- a/wxPython/src/_statctrls.i
+++ b/wxPython/src/_statctrls.i
@@ -16,19 +16,17 @@
 
 //---------------------------------------------------------------------------
 
-%{
-    DECLARE_DEF_STRING(StaticBitmapNameStr);
-    DECLARE_DEF_STRING(StaticBoxNameStr);
-    DECLARE_DEF_STRING(StaticTextNameStr);
-%}
+MAKE_CONST_WXSTRING(StaticBitmapNameStr);
+MAKE_CONST_WXSTRING(StaticBoxNameStr);
+MAKE_CONST_WXSTRING(StaticTextNameStr);
 
 //---------------------------------------------------------------------------
 %newgroup
 
 class wxStaticBox : public wxControl {
 public:
-    %addtofunc wxStaticBox         "self._setOORInfo(self)"
-    %addtofunc wxStaticBox()       ""
+    %pythonAppend wxStaticBox         "self._setOORInfo(self)"
+    %pythonAppend wxStaticBox()       ""
 
     wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,
@@ -51,8 +49,8 @@ public:
 
 class wxStaticLine : public wxControl {
 public:
-    %addtofunc wxStaticLine         "self._setOORInfo(self)"
-    %addtofunc wxStaticLine()       ""
+    %pythonAppend wxStaticLine         "self._setOORInfo(self)"
+    %pythonAppend wxStaticLine()       ""
 
     wxStaticLine( wxWindow *parent, wxWindowID id,
                   const wxPoint &pos = wxDefaultPosition,
@@ -71,7 +69,7 @@ public:
     bool IsVertical() const;
 
     // get the default size for the "lesser" dimension of the static line
-    static int GetDefaultSize() { return 2; }
+    static int GetDefaultSize();
 
 };
 
@@ -81,8 +79,8 @@ public:
 
 class wxStaticText : public wxControl {
 public:
-    %addtofunc wxStaticText         "self._setOORInfo(self)"
-    %addtofunc wxStaticText()       ""
+    %pythonAppend wxStaticText         "self._setOORInfo(self)"
+    %pythonAppend wxStaticText()       ""
 
     wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,
@@ -103,8 +101,8 @@ public:
 
 class wxStaticBitmap : public wxControl {
 public:
-    %addtofunc wxStaticText         "self._setOORInfo(self)"
-    %addtofunc wxStaticText()       ""
+    %pythonAppend wxStaticBitmap         "self._setOORInfo(self)"
+    %pythonAppend wxStaticBitmap()       ""
 
     wxStaticBitmap(wxWindow* parent, wxWindowID id,
                    const wxBitmap& bitmap,