just a whitespace change

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

diff --git a/wxPython/src/_statctrls.i b/wxPython/src/_statctrls.i
index 853e4373383085d0960818b7dcdfdb23ff2b3c2c..9c2df37ac931eb70fa420144a811f454fcf4083b 100644 (file)
--- a/wxPython/src/_statctrls.i
+++ b/wxPython/src/_statctrls.i
@@ -23,23 +23,34 @@ MAKE_CONST_WXSTRING(StaticTextNameStr);
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxStaticBox);
+

 class wxStaticBox : public wxControl {
 public:
     %pythonAppend wxStaticBox         "self._setOORInfo(self)"
     %pythonAppend wxStaticBox()       ""
 class wxStaticBox : public wxControl {
 public:
     %pythonAppend wxStaticBox         "self._setOORInfo(self)"
     %pythonAppend wxStaticBox()       ""

+    %typemap(out) wxStaticBox*;    // turn off this typemap

 
 

-    wxStaticBox(wxWindow* parent, wxWindowID id, const wxString& label,
+    wxStaticBox(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);
     %name(PreStaticBox)wxStaticBox();
 
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);
     %name(PreStaticBox)wxStaticBox();
 

-    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+    // Turn it back on again
+    %typemap(out) wxStaticBox* { $result = wxPyMake_wxObject($1, $owner); }
+
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxString& name = wxPyStaticBoxNameStr);

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 
 };
 
 


@@ -47,19 +58,21 @@ public:
 %newgroup
 
 
 %newgroup
 
 

+MustHaveApp(wxStaticLine);
+

 class wxStaticLine : public wxControl {
 public:
     %pythonAppend wxStaticLine         "self._setOORInfo(self)"
     %pythonAppend wxStaticLine()       ""
 
 class wxStaticLine : public wxControl {
 public:
     %pythonAppend wxStaticLine         "self._setOORInfo(self)"
     %pythonAppend wxStaticLine()       ""
 

-    wxStaticLine( wxWindow *parent, wxWindowID id,
+    wxStaticLine( wxWindow *parent, wxWindowID id=-1,

                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticLine)wxStaticLine();
 
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticLine)wxStaticLine();
 

-    bool Create( wxWindow *parent, wxWindowID id,
+    bool Create( wxWindow *parent, wxWindowID id=-1,

                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,
                   const wxPoint &pos = wxDefaultPosition,
                   const wxSize &size = wxDefaultSize,
                   long style = wxLI_HORIZONTAL,


@@ -69,51 +82,62 @@ public:
     bool IsVertical() const;
 
     // get the default size for the "lesser" dimension of the static line
     bool IsVertical() const;
 
     // get the default size for the "lesser" dimension of the static line

-    static int GetDefaultSize() { return 2; }
+    static int GetDefaultSize();

 
 

+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 
 //---------------------------------------------------------------------------
 %newgroup
 
 };
 
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxStaticText);
+

 class wxStaticText : public wxControl {
 public:
     %pythonAppend wxStaticText         "self._setOORInfo(self)"
     %pythonAppend wxStaticText()       ""
 
 class wxStaticText : public wxControl {
 public:
     %pythonAppend wxStaticText         "self._setOORInfo(self)"
     %pythonAppend wxStaticText()       ""
 

-    wxStaticText(wxWindow* parent, wxWindowID id, const wxString& label,
+    wxStaticText(wxWindow* parent, wxWindowID id=-1,
+                 const wxString& label = wxPyEmptyString,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticText)wxStaticText();
 
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
     %name(PreStaticText)wxStaticText();
 

-    bool Create(wxWindow* parent, wxWindowID id, const wxString& label,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                const wxString& label = wxPyEmptyString,

                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = 0,
                  const wxString& name = wxPyStaticTextNameStr);

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 //---------------------------------------------------------------------------
 %newgroup
 
 };
 
 //---------------------------------------------------------------------------
 %newgroup
 

+MustHaveApp(wxStaticBitmap);
+

 class wxStaticBitmap : public wxControl {
 public:
     %pythonAppend wxStaticBitmap         "self._setOORInfo(self)"
     %pythonAppend wxStaticBitmap()       ""
 
 class wxStaticBitmap : public wxControl {
 public:
     %pythonAppend wxStaticBitmap         "self._setOORInfo(self)"
     %pythonAppend wxStaticBitmap()       ""
 

-    wxStaticBitmap(wxWindow* parent, wxWindowID id,
-                   const wxBitmap& bitmap,
+    wxStaticBitmap(wxWindow* parent, wxWindowID id=-1,
+                   const wxBitmap& bitmap = wxNullBitmap,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxPyStaticBitmapNameStr);
     %name(PreStaticBitmap)wxStaticBitmap();
 
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxPyStaticBitmapNameStr);
     %name(PreStaticBitmap)wxStaticBitmap();
 

-    bool Create(wxWindow* parent, wxWindowID id,
-                   const wxBitmap& bitmap,
+    bool Create(wxWindow* parent, wxWindowID id=-1,
+                   const wxBitmap& bitmap = wxNullBitmap,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -122,6 +146,9 @@ public:
     wxBitmap GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
     void SetIcon(const wxIcon& icon);
     wxBitmap GetBitmap();
     void SetBitmap(const wxBitmap& bitmap);
     void SetIcon(const wxIcon& icon);

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------