Tweaks needed to update to current CVS

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

wxPython/contrib/gizmos/gizmos.i

@@ -23,7 +23,7 @@
 #include "wx/wxPython/pyclasses.h"
 
 #include <wx/gizmos/dynamicsash.h>
-#include <wx/gizmos/editlbox.h>
+//#include <wx/gizmos/editlbox.h>
 #include <wx/gizmos/splittree.h>
 #include <wx/gizmos/ledctrl.h>
 #include <wx/gizmos/statpict.h>
@@ -31,7 +31,7 @@
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
 #include <wx/imaglist.h>
-
+#include <wx/editlbox.h>
 %}
 
 //---------------------------------------------------------------------------

wxPython/contrib/stc/stc.i

@@ -23,7 +23,6 @@ languages are built-in."
 #include "wx/wxPython/wxPython.h"
 #include "wx/wxPython/pyclasses.h"
 #include <wx/stc/stc.h>
-
 %}
 
 //---------------------------------------------------------------------------
@@ -47,8 +46,12 @@ MustHaveApp(wxStyledTextCtrl);
 //---------------------------------------------------------------------------
 // Get all our defs from the REAL header file.
 
+#define wxUSE_STC 1
+#define WXDLLIMPEXP_STC
+#define WXDLLIMPEXP_CORE
 %include stc.h
 
+
 %extend wxStyledTextCtrl {
     %pythoncode {
         GetCaretLineBack = GetCaretLineBackground

wxPython/docs/CHANGES.txt

@@ -75,7 +75,16 @@ callbacks into the derived class.  The H version handles horizontal
 scrolling and the HV version handles both horizontal and vertical
 scrolling. 
 
+Support wx.APPLY and wx.CLOSE in CreateStdDialogButtonSizer()
 
+wx.CheckListBox now looks more native, especially under XP.
+
+Sizers distribute only the extra space between the stretchable items
+according to their proportions and not all available space. We believe
+the new behaviour corresponds better to user expectations but if you
+did rely on the old behaviour you will have to update your code to set
+the minimal sizes of the sizer items to be in the same proportion as
+the items proportions to return to the old behaviour.
 
 
 

wxPython/setup.py

@@ -627,7 +627,7 @@ if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
     #if os.name == 'nt':
-    STC_H = opj(WXDIR, 'contrib', 'include/wx/stc')
+    STC_H = opj(WXDIR, 'include/wx/stc')
     #else:
     #    STC_H = opj(WXPREFIX, 'include/wx-%d.%d/wx/stc' % (VER_MAJOR, VER_MINOR))
 
@@ -724,7 +724,7 @@ if BUILD_GIZMOS:
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp'        % opj(location, 'wxCode/src'),
                       '%s/gizmos/dynamicsash.cpp'  % opj(location, 'wxCode/src'),
-                      '%s/gizmos/editlbox.cpp'     % opj(location, 'wxCode/src'),
+                      #'%s/gizmos/editlbox.cpp'     % opj(location, 'wxCode/src'),
                       '%s/gizmos/ledctrl.cpp'      % opj(location, 'wxCode/src'),
                       '%s/gizmos/splittree.cpp'    % opj(location, 'wxCode/src'),
                       '%s/gizmos/statpict.cpp'     % opj(location, 'wxCode/src'),

wxPython/src/_app_ex.py

@@ -103,7 +103,7 @@ class App(wx.PyApp):
 
         :param redirect: Should ``sys.stdout`` and ``sys.stderr`` be
             redirected?  Defaults to True on Windows and Mac, False
-            otherwise.  If `filename` is None then output will be
+            otherwise.  If ``filename`` is None then output will be
             redirected to a window that pops up as needed.  (You can
             control what kind of window is created for the output by
             resetting the class variable ``outputWindowClass`` to a

wxPython/src/_image.i

@@ -27,7 +27,6 @@ enum {
     wxIMAGE_ALPHA_OPAQUE
 };
 
-
 // Constants for wxImage::Scale() for determining the level of quality
 enum
 {
@@ -1141,13 +1140,21 @@ MAKE_CONST_WXSTRING(IMAGE_OPTION_RESOLUTIONY);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_RESOLUTIONUNIT);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_QUALITY);
 
-enum
+// constants used with wxIMAGE_OPTION_RESOLUTIONUNIT
+enum wxImageResolution
 {
+    // Resolution not specified
+    wxIMAGE_RESOLUTION_NONE = 0,
+
+    // Resolution specified in inches
     wxIMAGE_RESOLUTION_INCHES = 1,
+
+    // Resolution specified in centimeters
     wxIMAGE_RESOLUTION_CM = 2
 };
 
 
+
 MAKE_CONST_WXSTRING(IMAGE_OPTION_BITSPERSAMPLE);
 MAKE_CONST_WXSTRING(IMAGE_OPTION_SAMPLESPERPIXEL); 
 MAKE_CONST_WXSTRING(IMAGE_OPTION_COMPRESSION);

wxPython/src/_sizers.i

@@ -1436,6 +1436,8 @@ sizer.", "");
         void , SetOrientation(int orient),
         "Resets the orientation of the sizer.", "");
 
+    bool IsVertical() const;
+    
     %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`");
 };
 

wxPython/src/_toplvl.i

@@ -382,6 +382,10 @@ public:
     void SetEscapeId(int escapeId);
     int GetEscapeId() const;
 
+    // Returns the parent to use for modal dialogs if the user did not specify it
+    // explicitly
+    wxWindow *GetParentForModalDialog(wxWindow *parent = NULL) const;
+
     // splits text up at newlines and places the
     // lines into a vertical wxBoxSizer
     wxSizer* CreateTextSizer( const wxString &message );

wxPython/src/_window.i

@@ -850,6 +850,9 @@ SetWindowStyleFlag()", "");
         long , GetExtraStyle() const,
         "Returns the extra style bits for the window.", "");
     
+    DocDeclStr(
+        bool , HasExtraStyle(int exFlag) const,
+        "Returns ``True`` if the given extra flag is set.", "");
 
     
     DocDeclStr(

wxPython/src/grid.i

@@ -853,7 +853,7 @@ public:
     void PaintBackground(const wxRect& rectCell, wxGridCellAttr *attr) {
         bool found;
         wxPyBlock_t blocked = wxPyBeginBlockThreads();
-        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground)"))) {
+        if ((found = wxPyCBH_findCallback(m_myInst, "PaintBackground"))) {
             PyObject* ao = wxPyMake_wxGridCellAttr(attr,false);
             PyObject* ro = wxPyConstructObject((void*)&rectCell, wxT("wxRect"), 0);