Fixed multiline static texts

[wxWidgets.git] / wxPython / src / _statctrls.i

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index 6560372c7514c76be7d987ee24f75071d7795822..63dc0fe569babb9c6568857dcadd84df617975a1 100644 (file)
--- 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:
 
 //---------------------------------------------------------------------------
 %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,
 
     wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
                 const wxPoint& pos = wxDefaultPosition,


@@ -51,8 +49,8 @@ public:
 
 class wxStaticLine : public wxControl {
 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,
 
     wxStaticLine( wxWindow *parent, wxWindowID id,
                   const wxPoint &pos = wxDefaultPosition,


@@ -81,8 +79,8 @@ public:
 
 class wxStaticText : public wxControl {
 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,
 
     wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
                  const wxPoint& pos = wxDefaultPosition,


@@ -103,8 +101,8 @@ public:
 
 class wxStaticBitmap : public wxControl {
 public:
 
 class wxStaticBitmap : public wxControl {
 public:

-    %addtofunc wxStaticText         "self._setOORInfo(self)"
-    %addtofunc wxStaticText()       ""
+    %pythonAppend wxStaticText         "self._setOORInfo(self)"
+    %pythonAppend wxStaticText()       ""

 
     wxStaticBitmap(wxWindow* parent, wxWindowID id,
                    const wxBitmap& bitmap,
 
     wxStaticBitmap(wxWindow* parent, wxWindowID id,
                    const wxBitmap& bitmap,