Lots of tweaks and additions to get caught up with CVS HEAD

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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index ba86f7459f4185c59d556d7760a90f5b9e0a22c1..ef87d2e1d11dba8f38bb55030f2cd4259ea268f4 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -5,6 +5,31 @@ Recent Changes for wxPython
 2.5.3.2
 -------
 
 2.5.3.2
 -------
 

+New factory based printing framework.  (TODO: Say more about this!)
+
+wx.Sizer Add, Insert, and Prepend funcitons now return a reference to the
+wx.SizerItem that was added to the sizer.
+
+Added wx.Sizer.GetItem method which returns the wx.SizerItem for the given
+wx.Window, wx.Sizer or position index.
+
+wxMSW: wx.RadioButtons in the same group no longer have to be
+consecutive (there may be intervening controls). Without this fix, an
+out-of-sync assert is generated when clicking on a radio button and
+then calling GetValue().
+
+XRC: 
+    - added 'icon' property to wxFrame and wxDialog
+    - no longer ignores menu bitmaps on non-MSW platforms
+
+wxMSW: fix for [ 1052989 ] TextCtrl.SetBackgroundColour(wx.NullColour)
+bug.
+
+Added wx.PasswordEntryDialog analagous to wx.TextEntryDialog, allows
+detecting entering an empty string vs. cancel unlike the
+wx.GetPasswordFromUser dialog function.
+
+

 OGL patch from Shane Holloway:
 
     Two simple problems found in the new python ogl code.  First is
 OGL patch from Shane Holloway:
 
     Two simple problems found in the new python ogl code.  First is


@@ -27,6 +52,14 @@ OGL patch from Shane Holloway:
 Fixed GetSaveData and SetSaveData in wx.lib.multisash to not depend on
 the default way that class objectss are converted to strings.
 
 Fixed GetSaveData and SetSaveData in wx.lib.multisash to not depend on
 the default way that class objectss are converted to strings.
 

+Fixed problem in StyledTextCtrl.Set[H|V]ScrollBar that could leave the
+internal scrollbar visible.
+
+Added wx.StandardPaths which provides methods for determining standard
+system paths for each platform.
+
+
+

 
 
 2.5.3.1
 
 
 2.5.3.1

diff --git a/wxPython/src/__misc_rename.i b/wxPython/src/__misc_rename.i
index 2f8619a9e84e9ceb53cbad3f422d868b5ced2956..ad56e1cab7aae49fbffa71502bbca30cd74fa7fb 100644 (file)
--- a/wxPython/src/__misc_rename.i
+++ b/wxPython/src/__misc_rename.i
@@ -342,5 +342,6 @@
 %rename(VideoMode)                          wxVideoMode;
 %rename(DefaultVideoMode)                   wxDefaultVideoMode;
 %rename(Display)                            wxDisplay;
 %rename(VideoMode)                          wxVideoMode;
 %rename(DefaultVideoMode)                   wxDefaultVideoMode;
 %rename(Display)                            wxDisplay;

+%rename(StandardPaths)                      wxStandardPaths;

 
 #endif
 
 #endif

diff --git a/wxPython/src/__windows_rename.i b/wxPython/src/__windows_rename.i
index da4522a8e4d4d541e8ba38586c5662e08ba98a64..952d313909bca8e2076d60514fb7f57d56413b4c 100644 (file)
--- a/wxPython/src/__windows_rename.i
+++ b/wxPython/src/__windows_rename.i
@@ -114,6 +114,7 @@
 %rename(MultiChoiceDialog)                  wxMultiChoiceDialog;
 %rename(SingleChoiceDialog)                 wxSingleChoiceDialog;
 %rename(TextEntryDialog)                    wxTextEntryDialog;
 %rename(MultiChoiceDialog)                  wxMultiChoiceDialog;
 %rename(SingleChoiceDialog)                 wxSingleChoiceDialog;
 %rename(TextEntryDialog)                    wxTextEntryDialog;

+%rename(PasswordEntryDialog)                wxPasswordEntryDialog;

 %rename(FontData)                           wxFontData;
 %rename(FontDialog)                         wxFontDialog;
 %rename(MessageDialog)                      wxMessageDialog;
 %rename(FontData)                           wxFontData;
 %rename(FontDialog)                         wxFontDialog;
 %rename(MessageDialog)                      wxMessageDialog;


@@ -188,5 +189,7 @@
 %rename(PyPrintPreview)                     wxPyPrintPreview;
 %rename(PyPreviewFrame)                     wxPyPreviewFrame;
 %rename(PyPreviewControlBar)                wxPyPreviewControlBar;
 %rename(PyPrintPreview)                     wxPyPrintPreview;
 %rename(PyPreviewFrame)                     wxPyPreviewFrame;
 %rename(PyPreviewControlBar)                wxPyPreviewControlBar;

+%rename(PrintFactory)                       wxPrintFactory;
+%rename(PrintNativeDataBase)                wxPrintNativeDataBase;

 
 #endif
 
 #endif

diff --git a/wxPython/src/_bitmap.i b/wxPython/src/_bitmap.i
index a89b83b9689683299c8f54253b6a155d6a20cf5d..a4c3236c9df9ed4e3eb0a803f74376184f2466a0 100644 (file)
--- a/wxPython/src/_bitmap.i
+++ b/wxPython/src/_bitmap.i
@@ -154,10 +154,6 @@ bit depths, the behaviour is platform dependent.", "");
     }    
 
     
     }    
 
     

-#ifdef __WXMSW__
-    void SetPalette(wxPalette& palette);
-#endif
-

     // wxGDIImage methods
 #ifdef __WXMSW__
     long GetHandle();
     // wxGDIImage methods
 #ifdef __WXMSW__
     long GetHandle();


@@ -249,8 +245,8 @@ the ``type`` parameter.", "");
     
 
     
     
 
     

-#if wxUSE_PALETTE

     virtual wxPalette *GetPalette() const;
     virtual wxPalette *GetPalette() const;

+#ifdef __WXMSW__

     virtual void SetPalette(const wxPalette& palette);
 #endif
     
     virtual void SetPalette(const wxPalette& palette);
 #endif
     

diff --git a/wxPython/src/_cmndlgs.i b/wxPython/src/_cmndlgs.i
index 1e4c13c7deb0ce773e9b3a3c49b444be0cbccd8d..9ca5cc301fe0b1547edf856917c243fa17054a02 100644 (file)
--- a/wxPython/src/_cmndlgs.i
+++ b/wxPython/src/_cmndlgs.i
@@ -252,7 +252,6 @@ example::
         void , SetFilterIndex(int filterIndex),
         "Sets the default filter index, starting from zero.", "");
     
         void , SetFilterIndex(int filterIndex),
         "Sets the default filter index, starting from zero.", "");
     

-

     DocDeclStr(
         wxString , GetMessage() const,
         "Returns the message that will be displayed on the dialog.", "");
     DocDeclStr(
         wxString , GetMessage() const,
         "Returns the message that will be displayed on the dialog.", "");


@@ -439,7 +438,7 @@ public:
                           const wxString& message,
                           const wxString& caption = wxPyGetTextFromUserPromptStr,
                           const wxString& defaultValue = wxPyEmptyString,
                           const wxString& message,
                           const wxString& caption = wxPyGetTextFromUserPromptStr,
                           const wxString& defaultValue = wxPyEmptyString,

-                          long style = wxOK | wxCANCEL | wxCENTRE,
+                          long style = wxTextEntryDialogStyle,

                           const wxPoint& pos = wxDefaultPosition),
         "Constructor.  Use ShowModal method to show the dialog.", "");
 
                           const wxPoint& pos = wxDefaultPosition),
         "Constructor.  Use ShowModal method to show the dialog.", "");
 


@@ -455,6 +454,21 @@ or the original value if the user has pressed Cancel.", "");
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MAKE_CONST_WXSTRING(GetPasswordFromUserPromptStr);
+
+class wxPasswordEntryDialog : public wxTextEntryDialog
+{
+public:
+    wxPasswordEntryDialog(wxWindow *parent,
+                      const wxString& message,
+                      const wxString& caption = wxPyGetPasswordFromUserPromptStr,
+                      const wxString& value = wxPyEmptyString,
+                      long style = wxTextEntryDialogStyle,
+                      const wxPoint& pos = wxDefaultPosition);
+};
+
+//---------------------------------------------------------------------------
+

 
 DocStr(wxFontData,
        "This class holds a variety of information related to font dialogs and
 
 DocStr(wxFontData,
        "This class holds a variety of information related to font dialogs and

diff --git a/wxPython/src/_gbsizer.i b/wxPython/src/_gbsizer.i
index 08e468f3c70355495830671c1ab5af70a7ccaefe..7f33dd3deb044c735ff96fc033340c1794b9c11b 100644 (file)
--- a/wxPython/src/_gbsizer.i
+++ b/wxPython/src/_gbsizer.i
@@ -368,7 +368,7 @@ rows and columns.", "");
     %extend {
         DocAStr(Add,
                 "Add(self, item, GBPosition pos, GBSpan span=DefaultSpan, int flag=0,
     %extend {
         DocAStr(Add,
                 "Add(self, item, GBPosition pos, GBSpan span=DefaultSpan, int flag=0,

-int border=0, userData=None)",
+int border=0, userData=None) -> wx.GBSizerItem",

                 
                 "Adds an item to the sizer at the grid cell *pos*, optionally spanning
 more than one row or column as specified with *span*.  The remaining
                 
                 "Adds an item to the sizer at the grid cell *pos*, optionally spanning
 more than one row or column as specified with *span*.  The remaining


@@ -377,12 +377,12 @@ args behave similarly to `wx.Sizer.Add`.
 Returns True if the item was successfully placed at the given cell
 position, False if something was already there.
 ", "");
 Returns True if the item was successfully placed at the given cell
 position, False if something was already there.
 ", "");

-        bool Add( PyObject* item,
-                  const wxGBPosition& pos,
-                  const wxGBSpan& span = wxDefaultSpan,
-                  int flag = 0,
-                  int border = 0,
-                  PyObject* userData = NULL ) {
+        wxGBSizerItem* Add( PyObject* item,
+                            const wxGBPosition& pos,
+                            const wxGBSpan& span = wxDefaultSpan,
+                            int flag = 0,
+                            int border = 0,
+                            PyObject* userData = NULL ) {

 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();


@@ -393,19 +393,19 @@ position, False if something was already there.
             
             // Now call the real Add method if a valid item type was found
             if ( info.window )
             
             // Now call the real Add method if a valid item type was found
             if ( info.window )

-                return self->Add(info.window, pos, span, flag, border, data);
+                return (wxGBSizerItem*)self->Add(info.window, pos, span, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                return self->Add(info.sizer, pos, span, flag, border, data);
+                return (wxGBSizerItem*)self->Add(info.sizer, pos, span, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
-                                 pos, span, flag, border, data);
-            return false;
+                return (wxGBSizerItem*)self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                                 pos, span, flag, border, data);
+            return NULL;

         }
     }
     
     DocDeclAStrName(
         }
     }
     
     DocDeclAStrName(

-        bool , Add( wxGBSizerItem *item ),
-        "Add(self, GBSizerItem item) -> bool",
+        wxGBSizerItem* , Add( wxGBSizerItem *item ),
+        "Add(self, GBSizerItem item) -> wx.GBSizerItem",

         "Add an item to the sizer using a `wx.GBSizerItem`.  Returns True if
 the item was successfully placed at its given cell position, False if
 something was already there.", "",
         "Add an item to the sizer using a `wx.GBSizerItem`.  Returns True if
 the item was successfully placed at its given cell position, False if
 something was already there.", "",

diff --git a/wxPython/src/_gdicmn.i b/wxPython/src/_gdicmn.i
index c62c8c7c10ebbea8999948900f9bfa3cef37f31f..37fd6107d0be867ad0c00ebdaf9768288be95c00 100644 (file)
--- a/wxPython/src/_gdicmn.i
+++ b/wxPython/src/_gdicmn.i
@@ -427,7 +427,12 @@ public:
         wxRect(const wxPoint& pos, const wxSize& size),
         "Create a new Rect from a position and size.", "",
          RectPS);
         wxRect(const wxPoint& pos, const wxSize& size),
         "Create a new Rect from a position and size.", "",
          RectPS);

-    
+
+    DocCtorStrName(
+        wxRect(const wxSize& size),
+        "Create a new Rect from a size only.", "",
+         RectS);
+

     ~wxRect();
 
     int GetX() const;
     ~wxRect();
 
     int GetX() const;

diff --git a/wxPython/src/_palette.i b/wxPython/src/_palette.i
index c83602f393faff77f76b193cd4234f3725be7212..ae12eb90cc4f91f3feef4fbd5e4465c92105de94 100644 (file)
--- a/wxPython/src/_palette.i
+++ b/wxPython/src/_palette.i
@@ -30,7 +30,7 @@ public:
     
     DocDeclA(
         bool, GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT),
     
     DocDeclA(
         bool, GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT),

-        "GetRGB(int pixel) -> (R,G,B)");
+        "GetRGB(self, int pixel) -> (R,G,B)");

 
     bool Ok();
 
 
     bool Ok();
 

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 9c657ceebc44edfea35284d8b9b570400af2fe65..897e48a954a3a4faad7df49ccb2dd6c95c006782 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -80,6 +80,7 @@ public:
 
     int GetQuality();
     wxPrintBin GetBin();
 
     int GetQuality();
     wxPrintBin GetBin();

+    wxPrintMode GetPrintMode() const;

     
     void SetNoCopies(int v);
     void SetCollate(bool flag);
     
     void SetNoCopies(int v);
     void SetCollate(bool flag);


@@ -92,22 +93,29 @@ public:
     void SetPaperSize(const wxSize& sz);
     void SetQuality(int quality);
     void SetBin(wxPrintBin bin);
     void SetPaperSize(const wxSize& sz);
     void SetQuality(int quality);
     void SetBin(wxPrintBin bin);

+    void SetPrintMode(wxPrintMode printMode);
+ 
+    wxString GetFilename() const;
+    void SetFilename( const wxString &filename );
+
+    %pythoncode { def __nonzero__(self): return self.Ok() }
+
+
+    // NOTE: These are now inside of #if WXWIN_COMPATIBILITY_2_4, so be
+    //       prepared to remove them...
+    

     // PostScript-specific data
     const wxString& GetPrinterCommand();
     const wxString& GetPrinterOptions();
     const wxString& GetPreviewCommand();
     // PostScript-specific data
     const wxString& GetPrinterCommand();
     const wxString& GetPrinterOptions();
     const wxString& GetPreviewCommand();

-    const wxString& GetFilename();

     const wxString& GetFontMetricPath();
     double GetPrinterScaleX();
     double GetPrinterScaleY();
     long GetPrinterTranslateX();
     long GetPrinterTranslateY();
     const wxString& GetFontMetricPath();
     double GetPrinterScaleX();
     double GetPrinterScaleY();
     long GetPrinterTranslateX();
     long GetPrinterTranslateY();

-    wxPrintMode GetPrintMode();
-

     void SetPrinterCommand(const wxString& command);
     void SetPrinterOptions(const wxString& options);
     void SetPreviewCommand(const wxString& command);
     void SetPrinterCommand(const wxString& command);
     void SetPrinterOptions(const wxString& options);
     void SetPreviewCommand(const wxString& command);

-    void SetFilename(const wxString& filename);

     void SetFontMetricPath(const wxString& path);
     void SetPrinterScaleX(double x);
     void SetPrinterScaleY(double y);
     void SetFontMetricPath(const wxString& path);
     void SetPrinterScaleX(double x);
     void SetPrinterScaleY(double y);


@@ -115,12 +123,7 @@ public:
     void SetPrinterTranslateX(long x);
     void SetPrinterTranslateY(long y);
     void SetPrinterTranslation(long x, long y);
     void SetPrinterTranslateX(long x);
     void SetPrinterTranslateY(long y);
     void SetPrinterTranslation(long x, long y);

-    void SetPrintMode(wxPrintMode printMode);
-
-    wxOutputStream* GetOutputStream();
-    void SetOutputStream(wxOutputStream* outputstream);

 
 

-    %pythoncode { def __nonzero__(self): return self.Ok() }

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -206,7 +209,10 @@ public:
     bool GetSelection() const;
     bool GetCollate() const;
     bool GetPrintToFile() const;
     bool GetSelection() const;
     bool GetCollate() const;
     bool GetPrintToFile() const;

+
+    // WXWIN_COMPATIBILITY_2_4

     bool GetSetupDialog() const;
     bool GetSetupDialog() const;

+    void SetSetupDialog(bool flag);

 
     void SetFromPage(int v);
     void SetToPage(int v);
 
     void SetFromPage(int v);
     void SetToPage(int v);


@@ -217,7 +223,6 @@ public:
     void SetSelection(bool flag);
     void SetCollate(bool flag);
     void SetPrintToFile(bool flag);
     void SetSelection(bool flag);
     void SetCollate(bool flag);
     void SetPrintToFile(bool flag);

-    void SetSetupDialog(bool flag);

 
     void EnablePrintToFile(bool flag);
     void EnableSelection(bool flag);
 
     void EnablePrintToFile(bool flag);
     void EnableSelection(bool flag);


@@ -234,11 +239,6 @@ public:
 
     
     wxPrintData& GetPrintData();
 
     
     wxPrintData& GetPrintData();

-//     %addmethods {
-//         %new wxPrintData* GetPrintData() {
-//             return new wxPrintData(self->GetPrintData());  // force a copy
-//         }
-//     }

     void SetPrintData(const wxPrintData& printData);
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
     void SetPrintData(const wxPrintData& printData);
 
     %pythoncode { def __nonzero__(self): return self.Ok() }


@@ -253,11 +253,16 @@ public:
 
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 
 
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 

-    wxPrintDialogData& GetPrintDialogData();
+    // TODO?: wxPrintDialog(wxWindow *parent, wxPrintData* data);
+    
+    virtual int ShowModal();
+
+    virtual wxPrintDialogData& GetPrintDialogData();
+    virtual wxPrintData& GetPrintData();

 
     %newobject GetPrintDC;
 
     %newobject GetPrintDC;

-    wxDC* GetPrintDC();
-    int ShowModal();
+    virtual wxDC *GetPrintDC();
+

 };
 
 
 };
 
 


@@ -280,14 +285,16 @@ public:
     wxPrinter(wxPrintDialogData* data = NULL);
     ~wxPrinter();
 
     wxPrinter(wxPrintDialogData* data = NULL);
     ~wxPrinter();
 

-    void CreateAbortWindow(wxWindow* parent, wxPyPrintout* printout);
-    wxPrintDialogData& GetPrintDialogData();
-    bool Print(wxWindow *parent, wxPyPrintout *printout, int prompt=true);
-    wxDC* PrintDialog(wxWindow *parent);
-    void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message);
-    bool Setup(wxWindow *parent);
-    bool GetAbort();
+    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPrintout *printout);
+    virtual void ReportError(wxWindow *parent, wxPrintout *printout, const wxString& message);
+
+    virtual bool Setup(wxWindow *parent);
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    
+    virtual wxPrintDialogData& GetPrintDialogData() const;

 
 

+    bool GetAbort();

     static wxPrinterError GetLastError();
 };
 
     static wxPrinterError GetLastError();
 };
 


@@ -773,6 +780,100 @@ public:
     void base_SetZoomControl(int zoom);
 };
 
     void base_SetZoomControl(int zoom);
 };
 

+//---------------------------------------------------------------------------
+// wxPrintFactory
+//---------------------------------------------------------------------------
+
+class wxPrintFactory
+{
+public:
+    // wxPrintFactory() {}            *** It's an ABC
+    // virtual ~wxPrintFactory();
+    
+    virtual wxPrinterBase *CreatePrinter( wxPrintDialogData* data );
+
+    %nokwargs CreatePrintPreview;
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+                                                    wxPrintout *printout = NULL, 
+                                                    wxPrintDialogData *data = NULL );
+    virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+                                                    wxPrintout *printout, 
+                                                    wxPrintData *data );
+
+    %nokwargs CreatePrintDialog;
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintDialogData *data = NULL );
+    virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+                                                  wxPrintData *data );
+                                                  
+    // What to do and what to show in the wxPrintDialog
+    // a) Use the generic print setup dialog or a native one?
+    virtual bool HasPrintSetupDialog();
+    virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
+    
+    // b) Provide the "print to file" option ourselves or via print setup?
+    virtual bool HasOwnPrintToFile();
+    
+    // c) Show current printer
+    virtual bool HasPrinterLine();
+    virtual wxString CreatePrinterLine();
+    
+    // d) Show Status line for current printer?
+    virtual bool HasStatusLine();
+    virtual wxString CreateStatusLine();
+
+                                                  
+    virtual wxPrintNativeDataBase *CreatePrintNativeData();
+    
+    static void SetPrintFactory( wxPrintFactory *factory );
+    static wxPrintFactory *GetFactory();
+    //static wxPrintFactory *m_factory;
+};
+
+// class wxNativePrintFactory: public wxPrintFactory
+// {
+// public:
+//     virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data );
+    
+//     virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+//                                                     wxPrintout *printout = NULL, 
+//                                                     wxPrintDialogData *data = NULL );
+//     virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, 
+//                                                     wxPrintout *printout,
+//                                                     wxPrintData *data );
+                                                    
+//     virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+//                                                   wxPrintDialogData *data = NULL );
+//     virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, 
+//                                                   wxPrintData *data );
+                                                  
+//     virtual bool HasPrintSetupDialog();
+//     virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data );
+//     virtual bool HasOwnPrintToFile();
+//     virtual bool HasPrinterLine();
+//     virtual wxString CreatePrinterLine();
+//     virtual bool HasStatusLine();
+//     virtual wxString CreateStatusLine();
+    
+//     virtual wxPrintNativeDataBase *CreatePrintNativeData();
+// };
+
+
+class wxPrintNativeDataBase: public wxObject
+{
+public:
+    wxPrintNativeDataBase();
+    virtual ~wxPrintNativeDataBase() {}
+    
+    virtual bool TransferTo( wxPrintData &data ) = 0;
+    virtual bool TransferFrom( const wxPrintData &data ) = 0; 
+    
+    virtual bool Ok() const = 0;
+    
+    int  m_ref;
+};
+
+

 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

diff --git a/wxPython/src/_region.i b/wxPython/src/_region.i
index 7a0dcb737c30d7213eebc42f1fac11e6156c089a..c26cbe99a16468ae6fc7f517d7f9866684d8a70c 100644 (file)
--- a/wxPython/src/_region.i
+++ b/wxPython/src/_region.i
@@ -57,9 +57,7 @@ public:
 
 
     void Clear();
 
 
     void Clear();

-#ifndef __WXMAC__

     bool Offset(wxCoord x, wxCoord y);
     bool Offset(wxCoord x, wxCoord y);

-#endif

 
     wxRegionContain Contains(wxCoord x, wxCoord y);
     %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);
 
     wxRegionContain Contains(wxCoord x, wxCoord y);
     %name(ContainsPoint)wxRegionContain Contains(const wxPoint& pt);

diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i
index 7d6635d34aed8ca0afb31617726a5ed8eda807eb..0a1f5101b9eb741e736af11070d3ab6aad5ccd51 100644 (file)
--- a/wxPython/src/_sizers.i
+++ b/wxPython/src/_sizers.i
@@ -146,6 +146,10 @@ added, if needed.", "");
     DocDeclStr(
         float , GetRatio(),
         "Set the ratio item attribute.", "");
     DocDeclStr(
         float , GetRatio(),
         "Set the ratio item attribute.", "");

+
+    DocDeclStr(
+        wxRect , GetRect(),
+        "Returns the rectangle that the sizer item should occupy", "");

     
 
     DocDeclStr(
     
 
     DocDeclStr(


@@ -378,7 +382,7 @@ public:
 
         DocAStr(Add,
                 "Add(self, item, int proportion=0, int flag=0, int border=0,
 
         DocAStr(Add,
                 "Add(self, item, int proportion=0, int flag=0, int border=0,

-    PyObject userData=None)",
+    PyObject userData=None) -> wx.SizerItem",

 
                 "Appends a child item to the sizer.", "
 
 
                 "Appends a child item to the sizer.", "
 


@@ -477,8 +481,8 @@ public:
         is more complex than the *proportion* and *flag* will allow for.
 ");
 
         is more complex than the *proportion* and *flag* will allow for.
 ");
 

-        void Add(PyObject* item, int proportion=0, int flag=0, int border=0,
-                  PyObject* userData=NULL) {
+        wxSizerItem*  Add(PyObject* item, int proportion=0, int flag=0, int border=0,
+                          PyObject* userData=NULL) {

             
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
             
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();


@@ -489,25 +493,27 @@ public:
             
             // Now call the real Add method if a valid item type was found
             if ( info.window )
             
             // Now call the real Add method if a valid item type was found
             if ( info.window )

-                self->Add(info.window, proportion, flag, border, data);
+                return self->Add(info.window, proportion, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Add(info.sizer, proportion, flag, border, data);
+                return self->Add(info.sizer, proportion, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                self->Add(info.size.GetWidth(), info.size.GetHeight(),
-                          proportion, flag, border, data);
+                return self->Add(info.size.GetWidth(), info.size.GetHeight(),
+                                 proportion, flag, border, data);
+            else
+                return NULL;

         }
 
         }
 

-//    virtual void AddSpacer(int size);
-//    virtual void AddStretchSpacer(int prop = 1);
+//    virtual wxSizerItem* AddSpacer(int size);
+//    virtual wxSizerItem* AddStretchSpacer(int prop = 1);

 
         DocAStr(Insert,
                 "Insert(self, int before, item, int proportion=0, int flag=0, int border=0,
 
         DocAStr(Insert,
                 "Insert(self, int before, item, int proportion=0, int flag=0, int border=0,

-    PyObject userData=None)",
+    PyObject userData=None) -> wx.SizerItem",

 
                 "Inserts a new item into the list of items managed by this sizer before
 the item at index *before*.  See `Add` for a description of the parameters.", "");
 
                 "Inserts a new item into the list of items managed by this sizer before
 the item at index *before*.  See `Add` for a description of the parameters.", "");

-        void Insert(int before, PyObject* item, int proportion=0, int flag=0,
-                     int border=0, PyObject* userData=NULL) {
+        wxSizerItem* Insert(int before, PyObject* item, int proportion=0, int flag=0,
+                            int border=0, PyObject* userData=NULL) {

 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();


@@ -518,26 +524,28 @@ the item at index *before*.  See `Add` for a description of the parameters.", ""
             
             // Now call the real Insert method if a valid item type was found
             if ( info.window )
             
             // Now call the real Insert method if a valid item type was found
             if ( info.window )

-                self->Insert(before, info.window, proportion, flag, border, data);
+                return self->Insert(before, info.window, proportion, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Insert(before, info.sizer, proportion, flag, border, data);
+                return self->Insert(before, info.sizer, proportion, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
-                             proportion, flag, border, data);
+                return self->Insert(before, info.size.GetWidth(), info.size.GetHeight(),
+                                    proportion, flag, border, data);
+            else
+                return NULL;

         }
 
 
         }
 
 

-//    virtual void InsertSpacer(size_t index, int size);
-//    virtual void InsertStretchSpacer(size_t index, int prop = 1);
+//    virtual wxSizerItem* InsertSpacer(size_t index, int size);
+//    virtual wxSizerItem* InsertStretchSpacer(size_t index, int prop = 1);

         
         DocAStr(Prepend,
                 "Prepend(self, item, int proportion=0, int flag=0, int border=0,
         
         DocAStr(Prepend,
                 "Prepend(self, item, int proportion=0, int flag=0, int border=0,

-    PyObject userData=None)",
+    PyObject userData=None) -> wx.SizerItem",

 
                "Adds a new item to the begining of the list of sizer items managed by
 this sizer.  See `Add` for a description of the parameters.", "");
 
                "Adds a new item to the begining of the list of sizer items managed by
 this sizer.  See `Add` for a description of the parameters.", "");

-        void Prepend(PyObject* item, int proportion=0, int flag=0, int border=0,
-                     PyObject* userData=NULL) {
+        wxSizerItem* Prepend(PyObject* item, int proportion=0, int flag=0, int border=0,
+                             PyObject* userData=NULL) {

 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();
 
             wxPyUserData* data = NULL;
             bool blocked = wxPyBeginBlockThreads();


@@ -548,16 +556,18 @@ this sizer.  See `Add` for a description of the parameters.", "");
             
             // Now call the real Prepend method if a valid item type was found
             if ( info.window )
             
             // Now call the real Prepend method if a valid item type was found
             if ( info.window )

-                self->Prepend(info.window, proportion, flag, border, data);
+                return self->Prepend(info.window, proportion, flag, border, data);

             else if ( info.sizer )
             else if ( info.sizer )

-                self->Prepend(info.sizer, proportion, flag, border, data);
+                return self->Prepend(info.sizer, proportion, flag, border, data);

             else if (info.gotSize)
             else if (info.gotSize)

-                self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
-                              proportion, flag, border, data);
+                return self->Prepend(info.size.GetWidth(), info.size.GetHeight(),
+                                     proportion, flag, border, data);
+            else
+                return NULL;

         }
 
         }
 

-//    virtual void PrependSpacer(int size);
-//    virtual void PrependStretchSpacer(int prop = 1);
+//    virtual wxSizerItem* PrependSpacer(int size);
+//    virtual wxSizerItem* PrependStretchSpacer(int prop = 1);

 
         DocAStr(Remove,
                 "Remove(self, item) -> bool",
 
         DocAStr(Remove,
                 "Remove(self, item) -> bool",


@@ -610,6 +620,26 @@ was found and detached.", "");
         }
 
         
         }
 
         

+        DocAStr(GetItem,
+                "GetItem(self, item) -> wx.SizerItem",
+                "Returns the `wx.SizerItem` which holds the *item* given.  The *item*
+parameter can be either a window, a sizer, or the zero-based index of
+the item to be detached.", "");
+        wxSizerItem* GetItem(PyObject* item) {
+            bool blocked = wxPyBeginBlockThreads();
+            wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
+            wxPyEndBlockThreads(blocked);
+            if ( info.window )
+                return self->GetItem(info.window);
+            else if ( info.sizer )
+                return self->GetItem(info.sizer);
+            else if ( info.gotPos )
+                return self->GetItem(info.pos);
+            else
+                return NULL;
+        }
+
+        

         void _SetItemMinSize(PyObject* item, const wxSize& size) {
             bool blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
         void _SetItemMinSize(PyObject* item, const wxSize& size) {
             bool blocked = wxPyBeginBlockThreads();
             wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);


@@ -641,19 +671,19 @@ was found and detached.", "");
     }
     
     DocDeclAStrName(
     }
     
     DocDeclAStrName(

-        void , Add( wxSizerItem *item ),
+        wxSizerItem* , Add( wxSizerItem *item ),

         "AddItem(self, SizerItem item)",
         "Adds a `wx.SizerItem` to the sizer.", "",
         AddItem);
     
     DocDeclAStrName(
         "AddItem(self, SizerItem item)",
         "Adds a `wx.SizerItem` to the sizer.", "",
         AddItem);
     
     DocDeclAStrName(

-        void , Insert( size_t index, wxSizerItem *item ),
+        wxSizerItem* , Insert( size_t index, wxSizerItem *item ),

         "InsertItem(self, int index, SizerItem item)",
         "Inserts a `wx.SizerItem` to the sizer at the position given by *index*.", "",
         InsertItem);
     
     DocDeclAStrName(
         "InsertItem(self, int index, SizerItem item)",
         "Inserts a `wx.SizerItem` to the sizer at the position given by *index*.", "",
         InsertItem);
     
     DocDeclAStrName(

-        void , Prepend( wxSizerItem *item ),
+        wxSizerItem* , Prepend( wxSizerItem *item ),

         "PrependItem(self, SizerItem item)",
         "Prepends a `wx.SizerItem` to the sizer.", "",
         PrependItem);
         "PrependItem(self, SizerItem item)",
         "Prepends a `wx.SizerItem` to the sizer.", "",
         PrependItem);

diff --git a/wxPython/src/_xmlhandler.i b/wxPython/src/_xmlhandler.i
index 4cad2e6e67a1cfdd9408ff41ec844ba5c575e90f..ba007253a127d3bf3df8c2d9b6f1262b8ff72959 100644 (file)
--- a/wxPython/src/_xmlhandler.i
+++ b/wxPython/src/_xmlhandler.i
@@ -40,7 +40,7 @@ public:
     wxObject* GetParent()               { return m_parent; }
     wxObject* GetInstance()             { return m_instance; }
     wxWindow* GetParentAsWindow()       { return m_parentAsWindow; }
     wxObject* GetParent()               { return m_parent; }
     wxObject* GetInstance()             { return m_instance; }
     wxWindow* GetParentAsWindow()       { return m_parentAsWindow; }

-    wxWindow* GetInstanceAsWindow()     { return m_instanceAsWindow; }
+//    wxWindow* GetInstanceAsWindow()     { return m_instanceAsWindow; }

 
 
     // turn some protected methods into public via delegation
 
 
     // turn some protected methods into public via delegation


@@ -166,7 +166,7 @@ public:
     wxObject* GetParent()               { return m_parent; }
     wxObject* GetInstance()             { return m_instance; }
     wxWindow* GetParentAsWindow()       { return m_parentAsWindow; }
     wxObject* GetParent()               { return m_parent; }
     wxObject* GetInstance()             { return m_instance; }
     wxWindow* GetParentAsWindow()       { return m_parentAsWindow; }

-    wxWindow* GetInstanceAsWindow()     { return m_instanceAsWindow; }
+//     wxWindow* GetInstanceAsWindow()     { return m_instanceAsWindow; }

 
 
     // Returns true if the node has a property class equal to classname,
 
 
     // Returns true if the node has a property class equal to classname,

diff --git a/wxPython/src/grid.i b/wxPython/src/grid.i
index 5b466633561705fb3c6fae0b9c604ae7e87ec077..aab2af22adde7c890a111f14d07bbfff41ba9047 100644 (file)
--- a/wxPython/src/grid.i
+++ b/wxPython/src/grid.i
@@ -2010,6 +2010,14 @@ public:
     wxWindow* GetGridColLabelWindow();
     wxWindow* GetGridCornerLabelWindow();
 
     wxWindow* GetGridColLabelWindow();
     wxWindow* GetGridCornerLabelWindow();
 

+    // Allow adjustment of scroll increment. The default is (15, 15).
+    void SetScrollLineX(int x);
+    void SetScrollLineY(int y);
+    int GetScrollLineX() const;
+    int GetScrollLineY() const;
+
+    int GetScrollX(int x) const;
+    int GetScrollY(int y) const;

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

diff --git a/wxPython/src/html.i b/wxPython/src/html.i
index e667d46e9878a14cae9fdfb391a6da828cfee9e6..9082654cfd1f2773d39b76800fd83162d79b6df9 100644 (file)
--- a/wxPython/src/html.i
+++ b/wxPython/src/html.i
@@ -1045,7 +1045,7 @@ public:
     void PreviewText(const wxString &htmltext, const wxString& basepath = wxPyEmptyString);
     void PrintFile(const wxString &htmlfile);
     void PrintText(const wxString &htmltext, const wxString& basepath = wxPyEmptyString);
     void PreviewText(const wxString &htmltext, const wxString& basepath = wxPyEmptyString);
     void PrintFile(const wxString &htmlfile);
     void PrintText(const wxString &htmltext, const wxString& basepath = wxPyEmptyString);

-    void PrinterSetup();
+//    void PrinterSetup();

     void PageSetup();
     void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
     void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);
     void PageSetup();
     void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
     void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);

diff --git a/wxPython/wx/tools/pywxrc.py b/wxPython/wx/tools/pywxrc.py
index 178d45a6eb1a2d31eb52970a5750baf38fbc4025..3a92664d7a53f50b027c6f9985084c34e8588634 100644 (file)
--- a/wxPython/wx/tools/pywxrc.py
+++ b/wxPython/wx/tools/pywxrc.py
@@ -298,6 +298,9 @@ class XmlResApp:
         if node.GetName() == "bitmap":
             return True
 
         if node.GetName() == "bitmap":
             return True
 

+        if node.GetName() == "icon":
+            return True
+

         # URLs in wxHtmlWindow:
         if node.GetName() == "url":
             return True
         # URLs in wxHtmlWindow:
         if node.GetName() == "url":
             return True

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index 35f0431e658f41211db6d9b4c375a93cf5a0fab7..e53110a378541a135770e87ba23f9ac0a1abe13a 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -624,6 +624,7 @@ wxRect = wx._core.Rect
 wxRectPtr = wx._core.RectPtr
 wxRectPP = wx._core.RectPP
 wxRectPS = wx._core.RectPS
 wxRectPtr = wx._core.RectPtr
 wxRectPP = wx._core.RectPP
 wxRectPS = wx._core.RectPS

+wxRectS = wx._core.RectS

 wxIntersectRect = wx._core.IntersectRect
 wxPoint2D = wx._core.Point2D
 wxPoint2DPtr = wx._core.Point2DPtr
 wxIntersectRect = wx._core.IntersectRect
 wxPoint2D = wx._core.Point2D
 wxPoint2DPtr = wx._core.Point2DPtr

diff --git a/wxPython/wxPython/_windows.py b/wxPython/wxPython/_windows.py
index 789a1568c8af6fd208aff6164db45ed0f264d2b4..d1a9ea9900a649bedf2147220043a50902d51e25 100644 (file)
--- a/wxPython/wxPython/_windows.py
+++ b/wxPython/wxPython/_windows.py
@@ -215,6 +215,9 @@ wxSingleChoiceDialog = wx._windows.SingleChoiceDialog
 wxSingleChoiceDialogPtr = wx._windows.SingleChoiceDialogPtr
 wxTextEntryDialog = wx._windows.TextEntryDialog
 wxTextEntryDialogPtr = wx._windows.TextEntryDialogPtr
 wxSingleChoiceDialogPtr = wx._windows.SingleChoiceDialogPtr
 wxTextEntryDialog = wx._windows.TextEntryDialog
 wxTextEntryDialogPtr = wx._windows.TextEntryDialogPtr

+wxGetPasswordFromUserPromptStr = wx._windows.GetPasswordFromUserPromptStr
+wxPasswordEntryDialog = wx._windows.PasswordEntryDialog
+wxPasswordEntryDialogPtr = wx._windows.PasswordEntryDialogPtr

 wxFontData = wx._windows.FontData
 wxFontDataPtr = wx._windows.FontDataPtr
 wxFontDialog = wx._windows.FontDialog
 wxFontData = wx._windows.FontData
 wxFontDataPtr = wx._windows.FontDataPtr
 wxFontDialog = wx._windows.FontDialog


@@ -338,6 +341,12 @@ wxPyPreviewFrame = wx._windows.PyPreviewFrame
 wxPyPreviewFramePtr = wx._windows.PyPreviewFramePtr
 wxPyPreviewControlBar = wx._windows.PyPreviewControlBar
 wxPyPreviewControlBarPtr = wx._windows.PyPreviewControlBarPtr
 wxPyPreviewFramePtr = wx._windows.PyPreviewFramePtr
 wxPyPreviewControlBar = wx._windows.PyPreviewControlBar
 wxPyPreviewControlBarPtr = wx._windows.PyPreviewControlBarPtr

+wxPrintFactory = wx._windows.PrintFactory
+wxPrintFactoryPtr = wx._windows.PrintFactoryPtr
+wxPrintFactory_SetPrintFactory = wx._windows.PrintFactory_SetPrintFactory
+wxPrintFactory_GetFactory = wx._windows.PrintFactory_GetFactory
+wxPrintNativeDataBase = wx._windows.PrintNativeDataBase
+wxPrintNativeDataBasePtr = wx._windows.PrintNativeDataBasePtr

 
 
 d = globals()
 
 
 d = globals()