X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96577d6d7a96c2b925cd7bcfb5695e1e154cdd3c..3bcdbe527fde583072eefab67de8974c0e17a1e2:/wxPython/src/_window.i?ds=sidebyside diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i index a56135c962..70e855e1d3 100644 --- a/wxPython/src/_window.i +++ b/wxPython/src/_window.i @@ -24,6 +24,40 @@ MAKE_CONST_WXSTRING(PanelNameStr); %newgroup +DocStr(wxVisualAttributes, + "struct containing all the visual attributes of a control"); + +struct wxVisualAttributes +{ + %extend { + wxVisualAttributes() { return new wxVisualAttributes; } + ~wxVisualAttributes() {} + } + + // the font used for control label/text inside it + wxFont font; + + // the foreground colour + wxColour colFg; + + // the background colour, may be wxNullColour if the controls background + // colour is not solid + wxColour colBg; +}; + + + + +enum wxWindowVariant +{ + wxWINDOW_VARIANT_NORMAL, // Normal size + wxWINDOW_VARIANT_SMALL, // Smaller size (about 25 % smaller than normal ) + wxWINDOW_VARIANT_MINI, // Mini size (about 33 % smaller than normal ) + wxWINDOW_VARIANT_LARGE, // Large size (about 25 % larger than normal ) + wxWINDOW_VARIANT_MAX +}; + + DocStr(wxWindow, " wx.Window is the base class for all windows and represents any visible @@ -157,8 +191,10 @@ public: %pythonAppend wxWindow "self._setOORInfo(self)" %pythonAppend wxWindow() "" + RefDoc(wxWindow, ""); // turn it off for the ctors + DocCtorStr( - wxWindow(wxWindow* parent, const wxWindowID id, + wxWindow(wxWindow* parent, const wxWindowID id=-1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -172,7 +208,7 @@ public: DocDeclStr( - bool , Create(wxWindow* parent, const wxWindowID id, + bool , Create(wxWindow* parent, const wxWindowID id=-1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -253,30 +289,43 @@ has been added to the list of windows pending real deletion."); DocDeclStr( virtual wxString , GetLabel() const, - "Generic way of getting a label from any window, for identification -purposes. The interpretation of this function differs from class to -class. For frames and dialogs, the value returned is the title. For -buttons or static text controls, it is the button text. This function -can be useful for meta-programs (such as testing tools or -special-needs access programs) which need to identify windows by name."); + "Generic way of getting a label from any window, for +identification purposes. The interpretation of this function +differs from class to class. For frames and dialogs, the value +returned is the title. For buttons or static text controls, it is +the button text. This function can be useful for meta-programs +such as testing tools or special-needs access programs)which +need to identify windows by name."); - // the window name is used for ressource setting in X, it is not the - // same as the window title/label DocDeclStr( virtual void , SetName( const wxString &name ), - "Sets the window's name. The window name is used for ressource setting -in X, it is not the same as the window title/label"); + "Sets the window's name. The window name is used for ressource +setting in X, it is not the same as the window title/label"); DocDeclStr( virtual wxString , GetName() const, - "Returns the window's name. This name is not guaranteed to be unique; -it is up to the programmer to supply an appropriate name in the window -constructor or via wx.Window.SetName."); + "Returns the windows name. This name is not guaranteed to be +unique; it is up to the programmer to supply an appropriate name +in the window constructor or via wx.Window.SetName."); + + + DocDeclStr( + void , SetWindowVariant( wxWindowVariant variant ), + "Sets the variant of the window/font size to use for this window, +if the platform supports variants, for example, wxMac. Variant values are: + + wx.WINDOW_VARIANT_NORMAL Normal size + wx.WINDOW_VARIANT_SMALL Smaller size (about 25 % smaller than normal) + wx.WINDOW_VARIANT_MINI Mini size (about 33 % smaller than normal) + wx.WINDOW_VARIANT_LARGE Large size (about 25 % larger than normal) +"); + + DocDeclStr( + wxWindowVariant , GetWindowVariant() const, + ""); - // window id uniquely identifies the window among its siblings unless - // it is -1 which means "don't care" DocDeclStr( void , SetId( wxWindowID winid ), "Sets the identifier of the window. Each window has an integer @@ -503,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, @@ -546,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 @@ -623,9 +682,10 @@ window had already been in the specified state."); DocDeclStr( virtual void , SetWindowStyleFlag( long style ), - "Sets the style of the window. Please note that some styles cannot be -changed after the window creation and that Refresh() might be called -after changing the others for the change to take place immediately."); + "Sets the style of the window. Please note that some styles cannot +be changed after the window creation and that Refresh() might +need to be called after changing the others for the change to +take place immediately."); DocDeclStr( virtual long , GetWindowStyleFlag() const, @@ -890,6 +950,37 @@ type."); virtual wxValidator *, GetValidator(), "Returns a pointer to the current validator for the window, or None if there is none."); + + + DocDeclStr( + virtual bool , Validate(), + "Validates the current values of the child controls using their +validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY +extra style flag set, the method will also call Validate() of all +child windows. Returns false if any of the validations failed."); + + + DocDeclStr( + virtual bool , TransferDataToWindow(), + "Transfers values to child controls from data areas specified by +their validators. If the window has wx.WS_EX_VALIDATE_RECURSIVELY +extra style flag set, the method will also call +TransferDataToWindow() of all child windows."); + + DocDeclStr( + virtual bool , TransferDataFromWindow(), + "Transfers values from child controls to data areas specified by +their validators. Returns false if a transfer failed. If the +window has wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the +method will also call TransferDataFromWindow() of all child +windows."); + + + DocDeclStr( + virtual void , InitDialog(), + "Sends an EVT_INIT_DIALOG event, whose handler usually transfers +data to the dialog via validators."); + @@ -920,11 +1011,11 @@ other application. To bind an event handler function to this hotkey use EVT_HOTKEY with an id equal to hotkeyId. Returns True if the hotkey was registered successfully."); bool RegisterHotKey(int hotkeyId, int modifiers, int keycode) { - #if wxUSE_HOTKEY + %#if wxUSE_HOTKEY return self->RegisterHotKey(hotkeyId, modifiers, keycode); - #else + %#else return False; - #endif + %#endif } @@ -1097,10 +1188,30 @@ exposed."); // colours, fonts and cursors // -------------------------- - // set/retrieve the window colours (system defaults are used by - // default): Set functions return True if colour was changed + DocDeclStr( + wxVisualAttributes , GetDefaultAttributes() const, + "Get the default attributes for an instance of this class. This +is useful if you want to use the same font or colour in your own +control as in a standard control -- which is a much better idea +than hard coding specific colours or fonts which might look +completely out of place on the users system, especially if it +uses themes."); + + DocDeclStr( + static wxVisualAttributes , + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL), + "Get the default attributes for this class. This is useful if +you want to use the same font or colour in your own control as +in a standard control -- which is a much better idea than hard +coding specific colours or fonts which might look completely out +of place on the users system, especially if it uses themes. + +The variant parameter is only relevant under Mac currently and is +ignore under other platforms. Under Mac, it will change the size of the +returned font. See SetWindowVariant for more about this."); + DocDeclStr( virtual bool , SetBackgroundColour( const wxColour &colour ), @@ -1117,6 +1228,12 @@ Use this function with care under GTK+ as the new appearance of the window might not look equally well when used with themes, i.e GTK+'s ability to change its look as the user wishes with run-time loadable modules."); + + DocDeclStr( + void , SetDefaultBackgroundColour(const wxColour& colour), + ""); + + DocDeclStr( virtual bool , SetForegroundColour( const wxColour &colour ), @@ -1124,8 +1241,13 @@ modules."); was changed. The interpretation of foreground colour is dependent on the window class; it may be the text colour or other colour, or it may not be used at all."); + + DocDeclStr( + void , SetDefaultForegroundColour(const wxColour& colour), + ""); + DocDeclStr( wxColour , GetBackgroundColour() const, "Returns the background colour of the window."); @@ -1157,6 +1279,12 @@ be reset back to default."); virtual bool , SetFont( const wxFont &font ), "Sets the font for this window."); + DocDeclStr( + void , SetDefaultFont(const wxFont& font), + ""); + + + DocDeclStr( wxFont& , GetFont(), "Returns the default font used for this window."); @@ -1595,6 +1723,47 @@ the window can remove itself from the sizer when it is destroyed."); + + DocDeclStr( + virtual void , InheritAttributes(), + "This function is (or should be, in case of custom controls) +called during window creation to intelligently set up the window +visual attributes, that is the font and the foreground and +background colours. + +By 'intelligently' the following is meant: by default, all +windows use their own default attributes. However if some of the +parent's attributes are explicitly changed (that is, using +SetFont and not SetDefaultFont) and if the corresponding +attribute hadn't been explicitly set for this window itself, then +this window takes the same value as used by the parent. In +addition, if the window overrides ShouldInheritColours to return +false, the colours will not be changed no matter what and only +the font might. + +This rather complicated logic is necessary in order to accomodate +the different usage scenarius. The most common one is when all +default attributes are used and in this case, nothing should be +inherited as in modern GUIs different controls use different +fonts (and colours) than their siblings so they can't inherit the +same value from the parent. However it was also deemed desirable +to allow to simply change the attributes of all children at once +by just changing the font or colour of their common parent, hence +in this case we do inherit the parents attributes."); + + +// TODO: Virtualize this with directors + DocDeclStr( + virtual bool , ShouldInheritColours() const, + "Return true from here to allow the colours of this window to be +changed by InheritAttributes, returning false forbids inheriting +them from the parent window. + +The base class version returns false, but this method is +overridden in wxControl where it returns true."); + + + %pythoncode { def PostCreate(self, pre): """