fixes for unicode build, return values from event handlers (via

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

diff --git a/wxPython/src/_dc.i b/wxPython/src/_dc.i
index edfe3a45e802ca7abdecf8e5457e3d90f963a244..e61213b4518d292109ee4bcd23c07637e5aca6a3 100644 (file)
--- a/wxPython/src/_dc.i
+++ b/wxPython/src/_dc.i
@@ -168,12 +168,13 @@ public:
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 
                      wxCoord xoffset = 0, wxCoord yoffset = 0,
                      int fillStyle = wxODDEVEN_RULE);
 

-    // TODO:  Figure out what the start parameter means and devise a
-    // good typemap for this    
-    //void DrawPolyPolygon(int n, int start[], wxPoint points[],
-    //                     wxCoord xoffset = 0, wxCoord yoffset = 0,
-    //                     int fillStyle = wxODDEVEN_RULE)
+    // TODO:  Figure out a good typemap for this...
+    //        Convert the first 3 args from a sequence of sequences?
+//     void DrawPolyPolygon(int n, int count[], wxPoint points[],
+//                           wxCoord xoffset = 0, wxCoord yoffset = 0,
+//                           int fillStyle = wxODDEVEN_RULE);

 
 

+    

     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and
     // this version puts both optional bitmap and the text into the given
     // rectangle and aligns is as specified by alignment parameter; it also
     // will emphasize the character with the given index if it is != -1 and


@@ -569,26 +570,105 @@ public:
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

-enum
+
+%{
+//-=-=-=-=-=-=-=-=-=-=-    
+
+#if 1
+// Use the standard wxBufferedDC
+#include <wx/dcbuffer.h>
+
+#else
+
+//  Or, temporarily put a set of classes here similar to the old buffered DC
+//  classes until the real ones can be fixed to work "correctly" again.
+
+class wxBufferedDC : public wxMemoryDC

 {
 {

-    // this is more efficient and hence default
-    wxBUFFER_DC_OVERWRITE_BG = 0,
+private:
+    wxDC        *m_dc;
+    wxBitmap    m_buffer;
+
+public:
+
+    wxBufferedDC() : m_dc( 0 ) {}
+    
+    wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
+        : m_dc( dc ), m_buffer( buffer )
+    {
+        SelectObject( m_buffer );
+    }
+       
+    wxBufferedDC( wxDC *dc, const wxSize &area )
+        : m_dc( dc ), m_buffer( area.GetWidth(), area.GetHeight() )
+    {
+        SelectObject( m_buffer );
+    }
+
+    ~wxBufferedDC() {
+        if( m_dc != 0 )
+            UnMask();
+    }

 
 

-    // preserve the old background: more time consuming
-    wxBUFFER_DC_PRESERVE_BG = 1,

 
 

-    // flags used by default
-    wxBUFFER_DC_DEFAULT = wxBUFFER_DC_OVERWRITE_BG
+    void Init( wxDC *dc, const wxBitmap &buffer ) {
+        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
+                      _T("wxBufferedDC already initialised") );
+        m_dc = dc;
+        m_buffer = buffer;
+        SelectObject( m_buffer );
+    }
+
+    void Init( wxDC *dc, const wxSize &area ) {
+        wxASSERT_MSG( m_dc == 0 && m_buffer == wxNullBitmap,
+                      _T("wxBufferedDC already initialised") );
+        m_dc = dc;
+        m_buffer = wxBitmap( area.GetWidth(), area.GetHeight() );
+        SelectObject( m_buffer );
+    }
+
+    void UnMask() {
+        wxASSERT_MSG( m_dc != 0, _T("No low level DC associated with buffer (anymore)") );
+        m_dc->Blit( 0, 0, m_buffer.GetWidth(), m_buffer.GetHeight(), this, 0, 0 );
+        m_dc = 0;
+    }

 };
 };

+ 
+
+class wxBufferedPaintDC : public wxBufferedDC
+{
+private:
+    wxPaintDC    m_paintdc;
+
+public:
+    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap )
+        : m_paintdc( window )
+    {
+        window->PrepareDC( m_paintdc );
+
+        if( buffer != wxNullBitmap )
+            Init( &m_paintdc, buffer );
+        else
+            Init( &m_paintdc, window->GetClientSize() );
+    }
+        
+    ~wxBufferedPaintDC() {
+        UnMask();
+    }
+};
+
+#endif
+//-=-=-=-=-=-=-=-=-=-=-    
+%}
+
+

 
 
 class wxBufferedDC : public wxMemoryDC
 {
 public:
 
 
 class wxBufferedDC : public wxMemoryDC
 {
 public:

-    %pythonAppend wxBufferedDC( wxDC *dc, const wxBitmap &buffer )
+    %pythonAppend wxBufferedDC

         "self._dc = args[0] # save a ref so the other dc will not be deleted before self";
         "self._dc = args[0] # save a ref so the other dc will not be deleted before self";

-    %pythonAppend wxBufferedDC( wxDC *dc, const wxSize &area, int flags = wxBUFFER_DC_DEFAULT )
-        "val._dc = args[0] # save a ref so the other dc will not be deleted before self";

 
     %nokwargs wxBufferedDC;
     
 
     %nokwargs wxBufferedDC;
     


@@ -598,11 +678,19 @@ public:
     // Construct a wxBufferedDC with an internal buffer of 'area'
     // (where area is usually something like the size of the window
     // being buffered)
     // Construct a wxBufferedDC with an internal buffer of 'area'
     // (where area is usually something like the size of the window
     // being buffered)

-    wxBufferedDC( wxDC *dc, const wxSize &area, int flags = wxBUFFER_DC_DEFAULT );
+    wxBufferedDC( wxDC *dc, const wxSize &area );

 
 

+    

     // TODO: Keep this one too?
     // TODO: Keep this one too?

-    %name(BufferedDCInternalBuffer) wxBufferedDC( wxDC *dc, const wxSize &area, int flags = wxBUFFER_DC_DEFAULT );
+    %pythonAppend wxBufferedDC( wxDC *dc, const wxSize &area )
+        "val._dc = args[0] # save a ref so the other dc will not be deleted before self";
+    %name(BufferedDCInternalBuffer) wxBufferedDC( wxDC *dc, const wxSize &area );

 
 

+    
+    // The buffer is blit to the real DC when the BufferedDC is destroyed.
+    ~wxBufferedDC();
+
+    

     // Blits the buffer to the dc, and detaches the dc from
     // the buffer.  Usually called in the dtor or by the dtor
     // of derived classes if the BufferedDC must blit before
     // Blits the buffer to the dc, and detaches the dc from
     // the buffer.  Usually called in the dtor or by the dtor
     // of derived classes if the BufferedDC must blit before


@@ -612,16 +700,16 @@ public:
 };
 
 
 };
 
 

+
+
+// Creates a double buffered wxPaintDC, optionally allowing the
+// user to specify their own buffer to use.

 class wxBufferedPaintDC : public wxBufferedDC
 {
 public:
 
 class wxBufferedPaintDC : public wxBufferedDC
 {
 public:
 

-    %nokwargs wxBufferedPaintDC;
-    
-    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer );
-
-    // this ctor creates a bitmap of the size of the window for buffering
-    wxBufferedPaintDC(wxWindow *window, int flags = wxBUFFER_DC_DEFAULT);
+    // If no bitmap is supplied by the user, a temporary one will be created.
+    wxBufferedPaintDC( wxWindow *window, const wxBitmap &buffer = wxNullBitmap );

 
 };
 
 
 };
 


@@ -702,7 +790,7 @@ public:
 %newgroup
 
 
 %newgroup
 
 

-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)

 
 %{
 #include <wx/metafile.h>
 
 %{
 #include <wx/metafile.h>


@@ -720,8 +808,10 @@ public:
     int GetWidth();
     int GetHeight();
 
     int GetWidth();
     int GetHeight();
 

+#ifdef __WXMSW__

     const wxString& GetFileName() const;
     const wxString& GetFileName() const;

-
+#endif
+    

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