Various little tweaks to get up to date with CVS

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

diff --git a/wxPython/src/__init__.py b/wxPython/src/__init__.py
index 9c45a5b1215be742134f86c83eab7640dd470bc3..53a578b4adeee86042ef9c238d019b3751d59e29 100644 (file)
--- a/wxPython/src/__init__.py
+++ b/wxPython/src/__init__.py
@@ -52,8 +52,7 @@ if 'wxMSW' in PlatformInfo:
 import wx._core
 __docfilter__ = wx._core.__DocFilter(globals())
 
-__all__ += [name for name in dir(wx._core)
-            if not (name.startswith('__') and name.endswith('__'))]
+__all__ += [name for name in dir(wx._core) if not name.startswith('_')]
 
 
 

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index 8f961259825ae06c456df73995c92e97a9f45656..255839ecd3a2c785117660be46841678e7691240 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -201,6 +201,7 @@ enum {
     wxFD_FILE_MUST_EXIST,
     wxFD_MULTIPLE,
     wxFD_CHANGE_DIR,
+    wxFD_PREVIEW,
     wxFD_DEFAULT_STYLE,
 };
 
@@ -458,7 +459,7 @@ public:
 
     DocDeclStr(
         int , GetSelection(),
-        "Get the index of teh currently selected item.", "");
+        "Get the index of the currently selected item.", "");
 
     DocDeclStr(
         wxString , GetStringSelection(),

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index 85d8175ffd55f24af83122f1f66dfaf2c98cea3a..adf3b06174c6784b89063918ae879521e2f89eb4 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -67,6 +67,22 @@ __init__ as a plain old wx.Control is not very useful.", "");
         "Do the 2nd phase and create the GUI control.", "");
     
 
+    DocDeclStr(
+        int , GetAlignment() const,
+        "Get the control alignment (left/right/centre, top/bottom/centre)", "");
+    
+
+    DocDeclStr(
+        static wxString , GetLabelText(const wxString& label),
+        "Get the string without mnemonic characters ('&')", "");
+    
+
+    DocDeclStr(
+        wxString , GetLabelText() const,
+        "Get just the text of the label, without mnemonic characters ('&')", "");
+    
+
+    
     DocDeclStr(
         void , Command(wxCommandEvent& event),
         "Simulates the effect of the user issuing a command to the item.

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 1e1dfc9fb2edf32a1286ed262d8f2e7b881ff4a7..b9b3c361c9fcf77266adfdbc60264ba5f3c7cf57 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -599,6 +599,8 @@ enum {
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
+    wxID_HELP_INDEX,
+    wxID_HELP_SEARCH,
     wxID_CLOSE_ALL,
     wxID_PREFERENCES,
 

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index 6e7e24241f02573de716d546e47a6d297c5e6691..ba3aaa69705a4c1f1e0201506c25acdf85e93906 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -176,6 +176,11 @@ than the corresponding dimensions of the size.", "");
         "Decrements this object so that both of its dimensions are not greater
 than the corresponding dimensions of the size.", "");
 
+    
+    DocDeclStr(
+        void , Scale(float xscale, float yscale),
+        "Scales the dimensions of this object by the given factors.", "");
+
     DocDeclStr(
         void, Set(int w, int h),
         "Set both width and height.", "");

diff --git a/wxPython/src/_log.i b/wxPython/src/_log.i
index f026dead0a3c2045336220266e689707e5a23451..f02bf3c39cd67566fbefb80ac6a422f1aa0a9679 100644 (file)
--- a/wxPython/src/_log.i
+++ b/wxPython/src/_log.i
@@ -106,6 +106,13 @@ public:
     // current is NULL?
     static void DontCreateOnDemand();
 
+    // log the count of repeating messages instead of logging the messages
+    // multiple times
+    static void SetRepetitionCounting(bool bRepetCounting = true);
+
+    // gets duplicate counting status
+    static bool GetRepetitionCounting();
+
     // trace mask (see wxTraceXXX constants for details)
     static void SetTraceMask(wxTraceMask ulMask);
 

diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i
index 78eb6632c2344988337a8c5457645de249226dcf..5314d3686bacf7a5b6f78261b8492d519ab355c9 100644 (file)
--- a/wxPython/src/_picker.i
+++ b/wxPython/src/_picker.i
@@ -68,6 +68,16 @@ The value passed to this function must be >= 1.", "");
         int , GetTextCtrlProportion() const,
         "Returns the proportion between the text control and the picker.", "");
 
+
+    DocDeclStr(
+        void , SetPickerCtrlProportion(int prop),
+        "Sets the proportion value of the picker.", "");
+    
+    DocDeclStr(
+        int , GetPickerCtrlProportion() const,
+        "Gets the proportion value of the picker.", "");
+    
+    
     DocDeclStr(
         bool , IsTextCtrlGrowable() const,
         "", "");

diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index a99ce0c36291beb614c81e45c0cb77ccdf0adad2..fbf4fe4fdf42b99e893711125a41fadf941e2450 100644 (file)
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -174,6 +174,25 @@ public:
     virtual bool SetTransparent(byte alpha); 
     virtual bool CanSetTransparent();
 
+    
+    
+    DocDeclStr(
+        virtual wxWindow *, GetDefaultItem() const,
+        "Get the default child of this parent, i.e. the one which is activated
+by pressing <Enter> such as the OK button on a wx.Dialog.", "");
+    
+    DocDeclStr(
+        virtual wxWindow *, SetDefaultItem(wxWindow * child),
+        "Set this child as default, return the old default.", "");
+    
+    DocDeclStr(
+        virtual void , SetTmpDefaultItem(wxWindow * win),
+        "Set this child as temporary default", "");
+
+    DocDeclStr(
+        virtual wxWindow *, GetTmpDefaultItem() const,
+        "Return the temporary default item, which can be None.", "");
+       
 };
 
 

diff --git a/wxPython/src/_window.i b/wxPython/src/_window.i
index f90a6442b9f7d149a7e2e24095187304790c1cc0..2e014bcd137229de7392d1a2259888e631892cb3 100644 (file)
--- a/wxPython/src/_window.i
+++ b/wxPython/src/_window.i
@@ -862,25 +862,6 @@ it.", "");
     
 
 
-    
-    DocDeclStr(
-        virtual wxWindow *, GetDefaultItem() const,
-        "Get the default child of this parent, i.e. the one which is activated
-by pressing <Enter> such as the OK button on a wx.Dialog.", "");
-    
-    DocDeclStr(
-        virtual wxWindow *, SetDefaultItem(wxWindow * child),
-        "Set this child as default, return the old default.", "");
-    
-    DocDeclStr(
-        virtual void , SetTmpDefaultItem(wxWindow * win),
-        "Set this child as temporary default", "");
-
-    DocDeclStr(
-        virtual wxWindow *, GetTmpDefaultItem() const,
-        "Return the temporary default item, which can be None.", "");
-    
-
 
     DocDeclAStr(
         virtual bool , Navigate(int flags = wxNavigationKeyEvent::IsForward),
@@ -1626,7 +1607,10 @@ mouse cursor will be used.", "");
     bool PopupMenu(wxMenu *menu, const wxPoint& pos=wxDefaultPosition);
 
 
-
+    DocDeclStr(
+        virtual bool , HasMultiplePages() const,
+        "", "");
+    
     
     %extend {
         DocStr(GetHandle,

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index e2c63de53a6087c244e97ca49fb0906473daf9c9..6c78cc4bb7bbb993ee1db54c37d40a1e52ee938f 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -1804,6 +1804,12 @@ public:
     wxString GetRowLabelValue( int row );
     wxString GetColLabelValue( int col );
     wxColour GetGridLineColour();
+
+    virtual wxPen GetDefaultGridLinePen();
+    virtual wxPen GetRowGridLinePen(int row);
+    virtual wxPen GetColGridLinePen(int col);
+    
+    
     wxColour GetCellHighlightColour();
     int      GetCellHighlightPenWidth();
     int      GetCellHighlightROPenWidth();