Added wxStaticPicture

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/contrib/gizmos/_gizmos_rename.i b/wxPython/contrib/gizmos/_gizmos_rename.i
index b01e44ad3db21b14df7c90e6190be9457ebfeb34..e80e0a17bb1282d6693612e02dcc4c64e7d40398 100644 (file)
--- a/wxPython/contrib/gizmos/_gizmos_rename.i
+++ b/wxPython/contrib/gizmos/_gizmos_rename.i
@@ -32,5 +32,10 @@
 %rename(TL_SEARCH_NOCASE)                   wxTL_SEARCH_NOCASE;
 %rename(TR_DONT_ADJUST_MAC)                 wxTR_DONT_ADJUST_MAC;
 %rename(TreeListColumnInfo)                 wxTreeListColumnInfo;
+%rename(SCALE_HORIZONTAL)                   wxSCALE_HORIZONTAL;
+%rename(SCALE_VERTICAL)                     wxSCALE_VERTICAL;
+%rename(SCALE_UNIFORM)                      wxSCALE_UNIFORM;
+%rename(SCALE_CUSTOM)                       wxSCALE_CUSTOM;
+%rename(StaticPicture)                      wxStaticPicture;
 
 #endif

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index 9c8ca60fb3a3d72cb1eb5f8db94aeeb2597ea911..925d17bff83b7a23c27cfb023d342d1d666c3fe8 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -26,6 +26,7 @@
 #include <wx/gizmos/editlbox.h>
 #include <wx/gizmos/splittree.h>
 #include <wx/gizmos/ledctrl.h>
+#include <wx/gizmos/statpict.h>
 
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
@@ -47,7 +48,8 @@
 MAKE_CONST_WXSTRING2(DynamicSashNameStr,     wxT("dynamicSashWindow"));
 MAKE_CONST_WXSTRING2(EditableListBoxNameStr, wxT("editableListBox"));
 MAKE_CONST_WXSTRING2(TreeListCtrlNameStr,    wxT("treelistctrl"));
-
+MAKE_CONST_WXSTRING(StaticPictureNameStr);
+    
 MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
 
 
@@ -957,7 +959,55 @@ public:
 
 };
 
+//----------------------------------------------------------------------
+
+enum
+{
+    wxSCALE_HORIZONTAL,
+    wxSCALE_VERTICAL,
+    wxSCALE_UNIFORM,
+    wxSCALE_CUSTOM    
+};
+
+MustHaveApp(wxStaticPicture);
+
+class wxStaticPicture : public wxControl
+{
+public:
+    %pythonAppend wxStaticPicture         "self._setOORInfo(self)"
+    %pythonAppend wxStaticPicture()       ""
+
+    wxStaticPicture( wxWindow* parent, wxWindowID id,
+                     const wxBitmap& label,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize,
+                     long style = 0,
+                     const wxString& name = wxPyStaticPictureNameStr );
+
+    %RenameCtor(PreStaticPicture, wxStaticPicture());
+
+    bool Create( wxWindow* parent, wxWindowID id,
+                 const wxBitmap& label,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = 0,
+                 const wxString& name = wxPyStaticPictureNameStr );
+
+    void SetBitmap( const wxBitmap& bmp );
+    wxBitmap GetBitmap() const;
+    void SetIcon( const wxIcon& icon );
+    wxIcon GetIcon() const;
 
+    void SetAlignment( int align );
+    int GetAlignment() const;
+
+    void SetScale( int scale );
+    int GetScale() const; 
+
+    void SetCustomScale( float sx, float sy );
+    void GetCustomScale( float* OUTPUT, float* OUTPUT ) const;
+
+};
 
 
 //----------------------------------------------------------------------

diff --git a/wxPython/wxPython/gizmos.py b/wxPython/wxPython/gizmos.py
index 69cc0b9c9c4fa66719ef88664ddb7e22cea1179f..af499988f99f42827c4b00ad9ed58c6d7d6a5d05 100644 (file)
--- a/wxPython/wxPython/gizmos.py
+++ b/wxPython/wxPython/gizmos.py
@@ -22,6 +22,7 @@ del sys, _wx
 wxDynamicSashNameStr = wx.gizmos.DynamicSashNameStr
 wxEditableListBoxNameStr = wx.gizmos.EditableListBoxNameStr
 wxTreeListCtrlNameStr = wx.gizmos.TreeListCtrlNameStr
+wxStaticPictureNameStr = wx.gizmos.StaticPictureNameStr
 wxDS_MANAGE_SCROLLBARS = wx.gizmos.DS_MANAGE_SCROLLBARS
 wxDS_DRAG_CORNER = wx.gizmos.DS_DRAG_CORNER
 wxEVT_DYNAMIC_SASH_SPLIT = wx.gizmos.wxEVT_DYNAMIC_SASH_SPLIT
@@ -71,6 +72,13 @@ wxTreeListCtrl = wx.gizmos.TreeListCtrl
 wxTreeListCtrlPtr = wx.gizmos.TreeListCtrlPtr
 wxTreeListCtrl = wx.gizmos.TreeListCtrl
 wxPreTreeListCtrl = wx.gizmos.PreTreeListCtrl
+wxSCALE_HORIZONTAL = wx.gizmos.SCALE_HORIZONTAL
+wxSCALE_VERTICAL = wx.gizmos.SCALE_VERTICAL
+wxSCALE_UNIFORM = wx.gizmos.SCALE_UNIFORM
+wxSCALE_CUSTOM = wx.gizmos.SCALE_CUSTOM
+wxStaticPicture = wx.gizmos.StaticPicture
+wxStaticPicturePtr = wx.gizmos.StaticPicturePtr
+wxPreStaticPicture = wx.gizmos.PreStaticPicture
 
 
 d = globals()