Added wx.FIXED_SIZE.

Added some new methods to wx.Window
Added a Destroy method to wx.TaskbarIcon to help avoid double deletes

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

diff --git a/wxPython/src/_core_rename.i b/wxPython/src/_core_rename.i
index 8e0bfa131e956e9a18c51def963bcce62a4c9c94..3e6027cbad6d42040c84cc764715d921eb0f75cb 100644 (file)
--- a/wxPython/src/_core_rename.i
+++ b/wxPython/src/_core_rename.i
@@ -276,8 +276,9 @@
 %rename(GROW)                               wxGROW;
 %rename(EXPAND)                             wxEXPAND;
 %rename(SHAPED)                             wxSHAPED;
 %rename(GROW)                               wxGROW;
 %rename(EXPAND)                             wxEXPAND;
 %rename(SHAPED)                             wxSHAPED;

-%rename(ADJUST_MINSIZE)                     wxADJUST_MINSIZE;
+%rename(FIXED_SIZE)                         wxFIXED_SIZE;

 %rename(TILE)                               wxTILE;
 %rename(TILE)                               wxTILE;

+%rename(ADJUST_MINSIZE)                     wxADJUST_MINSIZE;

 %rename(BORDER_DEFAULT)                     wxBORDER_DEFAULT;
 %rename(BORDER_NONE)                        wxBORDER_NONE;
 %rename(BORDER_STATIC)                      wxBORDER_STATIC;
 %rename(BORDER_DEFAULT)                     wxBORDER_DEFAULT;
 %rename(BORDER_NONE)                        wxBORDER_NONE;
 %rename(BORDER_STATIC)                      wxBORDER_STATIC;

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 689847ac6d00e1c770bb2d733f8d33f28d95714e..c0b251404b2e4aa91b7d0bfb9a943a5ef47e646f 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -609,8 +609,9 @@ enum wxStretch
     wxGROW,
     wxEXPAND,
     wxSHAPED,
     wxGROW,
     wxEXPAND,
     wxSHAPED,

-    wxADJUST_MINSIZE,
+    wxFIXED_SIZE,

     wxTILE,
     wxTILE,

+    wxADJUST_MINSIZE,

 };
 
 
 };
 
 

diff --git a/wxPython/src/_taskbar.i b/wxPython/src/_taskbar.i
index c32be7d5a7b91dbde19ba709a4dc433367c1ca81..5d4c54bf88e13b628e2c08099ca3373b24d7922d 100644 (file)
--- a/wxPython/src/_taskbar.i
+++ b/wxPython/src/_taskbar.i
@@ -61,7 +61,14 @@ class wxTaskBarIcon : public wxEvtHandler
 public:
     wxTaskBarIcon();
     ~wxTaskBarIcon();
 public:
     wxTaskBarIcon();
     ~wxTaskBarIcon();

-   
+
+    %extend {
+        void Destroy() {
+        #ifndef __WXMAC__
+            self->RemoveIcon();
+        #endif
+        }
+    }

 
 #ifndef __WXMAC__
     bool IsOk() const;
 
 #ifndef __WXMAC__
     bool IsOk() const;

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 78f537ae5675af7a9d4502e159cf4ffbcb088e16..37479191f082aab5c6d1c01f57b5923557c82a2b 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -552,26 +552,32 @@ windows without an interior sizer. This function similarly won't do
 anything if there are no subwindows.");
     
 
 anything if there are no subwindows.");
     
 

-
-    DocDeclStr(
-        virtual void , SetSizeHints( int minW, int minH,
-                                     int maxW = -1, int maxH = -1,
-                                     int incW = -1, int incH = -1 ),
+    
+    %nokwargs SetSizeHints;
+    DocStr(SetSizeHints,

         "Allows specification of minimum and maximum window sizes, and window
 size increments. If a pair of values is not set (or set to -1), the
 default values will be used.  If this function is called, the user
 will not be able to size the window outside the given bounds. The
 resizing increments are only significant under Motif or Xt.");
         "Allows specification of minimum and maximum window sizes, and window
 size increments. If a pair of values is not set (or set to -1), the
 default values will be used.  If this function is called, the user
 will not be able to size the window outside the given bounds. The
 resizing increments are only significant under Motif or Xt.");

-    
+    virtual void SetSizeHints( int minW, int minH,
+                               int maxW = -1, int maxH = -1,
+                               int incW = -1, int incH = -1 );
+    void SetSizeHints( const wxSize& minSize,
+                       const wxSize& maxSize=wxDefaultSize,
+                       const wxSize& incSize=wxDefaultSize);

 
 

-    DocDeclStr(
-        virtual void , SetVirtualSizeHints( int minW, int minH,
-                                            int maxW = -1, int maxH = -1 ),
+    
+    %nokwargs SetVirtualSizeHints;
+    DocStr(SetVirtualSizeHints,

         "Allows specification of minimum and maximum virtual window sizes. If a
 pair of values is not set (or set to -1), the default values will be
 used.  If this function is called, the user will not be able to size
 the virtual area of the window outside the given bounds.");
         "Allows specification of minimum and maximum virtual window sizes. If a
 pair of values is not set (or set to -1), the default values will be
 used.  If this function is called, the user will not be able to size
 the virtual area of the window outside the given bounds.");

-    
+    virtual void SetVirtualSizeHints( int minW, int minH,
+                                      int maxW = -1, int maxH = -1 );
+    void SetVirtualSizeHints( const wxSize& minSize,
+                              const wxSize& maxSize=wxDefaultSize);

     
     DocDeclStr(
         virtual int , GetMinWidth() const,
     
     DocDeclStr(
         virtual int , GetMinWidth() const,


@@ -595,6 +601,10 @@ the virtual area of the window outside the given bounds.");
         "");
     
 
         "");
     
 

+    DocDeclStr(
+        virtual wxSize , GetMinSize() const,
+        "");
+    

     
     DocStr(SetVirtualSize,
            "Set the the virtual size of a window in pixels.  For most windows this
     
     DocStr(SetVirtualSize,
            "Set the the virtual size of a window in pixels.  For most windows this