install activex too

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

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index 7e2a4c8d93e8a05332434ae234f318b575a0ff22..cce8a97a991330c5f0cca37cae6e8bd404b664fc 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -24,6 +24,16 @@ MAKE_CONST_WXSTRING(PanelNameStr);
 %newgroup
 
 
 %newgroup
 
 

+enum wxWindowVariant 
+{
+    wxWINDOW_VARIANT_DEFAULT,       // Default size (usually == normal, may be set by a wxSystemOptions entry)
+    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 )
+};
+
+

 DocStr(wxWindow,
 "
 wx.Window is the base class for all windows and represents any visible
 DocStr(wxWindow,
 "
 wx.Window is the base class for all windows and represents any visible


@@ -157,6 +167,8 @@ public:
     %pythonAppend wxWindow         "self._setOORInfo(self)"
     %pythonAppend wxWindow()       ""
 
     %pythonAppend wxWindow         "self._setOORInfo(self)"
     %pythonAppend wxWindow()       ""
 

+    RefDoc(wxWindow, ""); // turn it off for the ctors
+    

     DocCtorStr(
         wxWindow(wxWindow* parent, const wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
     DocCtorStr(
         wxWindow(wxWindow* parent, const wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,


@@ -253,30 +265,40 @@ has been added to the list of windows pending real deletion.");
     
     DocDeclStr(
         virtual wxString , GetLabel() const,
     
     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 ),
     
 
     // 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,
     
     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 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.");
+
+    
+    
+    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.)");
+    
+    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
     DocDeclStr(
         void , SetId( wxWindowID winid ),
         "Sets the identifier of the window.  Each window has an integer


@@ -1690,6 +1712,12 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
 
 
 
 
 
 

+%{
+#ifdef __WXMSW__
+#include <wx/msw/private.h>  // to get wxGetWindowId
+#endif
+%}
+

 %inline %{
     wxWindow* wxWindow_FromHWND(wxWindow* parent, unsigned long _hWnd) {
 #ifdef __WXMSW__
 %inline %{
     wxWindow* wxWindow_FromHWND(wxWindow* parent, unsigned long _hWnd) {
 #ifdef __WXMSW__