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
This commit is contained in:
parent
13fc2ad819
commit
33e10b88cf
@ -276,8 +276,9 @@
|
||||
%rename(GROW) wxGROW;
|
||||
%rename(EXPAND) wxEXPAND;
|
||||
%rename(SHAPED) wxSHAPED;
|
||||
%rename(ADJUST_MINSIZE) wxADJUST_MINSIZE;
|
||||
%rename(FIXED_SIZE) wxFIXED_SIZE;
|
||||
%rename(TILE) wxTILE;
|
||||
%rename(ADJUST_MINSIZE) wxADJUST_MINSIZE;
|
||||
%rename(BORDER_DEFAULT) wxBORDER_DEFAULT;
|
||||
%rename(BORDER_NONE) wxBORDER_NONE;
|
||||
%rename(BORDER_STATIC) wxBORDER_STATIC;
|
||||
|
@ -609,8 +609,9 @@ enum wxStretch
|
||||
wxGROW,
|
||||
wxEXPAND,
|
||||
wxSHAPED,
|
||||
wxADJUST_MINSIZE,
|
||||
wxFIXED_SIZE,
|
||||
wxTILE,
|
||||
wxADJUST_MINSIZE,
|
||||
};
|
||||
|
||||
|
||||
|
@ -61,7 +61,14 @@ class wxTaskBarIcon : public wxEvtHandler
|
||||
public:
|
||||
wxTaskBarIcon();
|
||||
~wxTaskBarIcon();
|
||||
|
||||
|
||||
%extend {
|
||||
void Destroy() {
|
||||
#ifndef __WXMAC__
|
||||
self->RemoveIcon();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#ifndef __WXMAC__
|
||||
bool IsOk() const;
|
||||
|
@ -552,26 +552,32 @@ windows without an interior sizer. This function similarly won't do
|
||||
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.");
|
||||
|
||||
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.");
|
||||
|
||||
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,
|
||||
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user