wxMemoryDC constructor now optionally accepts a wxBitmap parameter,

calling SelectObject itself if a valid bitmap is passed.


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

docs/changes.txt

@@ -52,6 +52,17 @@ Major changes in 2.7 release
 - New AUI library supporting docking windows and much more
 
 
+2.7.2
+-----
+
+All (GUI): 
+
+- wxMemoryDC constructor now optionally accepts a wxBitmap parameter,
+  calling SelectObject itself if a valid bitmap is passed.
+
+
+
+
 2.7.1
 -----
 

docs/latex/wx/memorydc.tex

@@ -41,13 +41,14 @@ can be reselected into another memory DC.
 
 \membersection{wxMemoryDC::wxMemoryDC}\label{wxmemorydcctor}
 
-\func{}{wxMemoryDC}{\void}
+\func{}{wxMemoryDC}{\param{const wxBitmap\& }{bitmap = wxNullBitmap}}
 
 Constructs a new memory device context.
 
 Use the {\it Ok} member to test whether the constructor was successful
-in creating a usable device context. Don't forget to select a bitmap
-into the DC before drawing on it.
+in creating a usable device context. If you don't pass a valid bitmap
+to the constructor, don't forget to select a bitmap into the DC before
+drawing on it.
 
 \membersection{wxMemoryDC::SelectObject}\label{wxmemorydcselectobject}
 

include/wx/cocoa/dcmemory.h

@@ -18,7 +18,7 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
 {
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 public:
-    wxMemoryDC(void);
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
     virtual void SelectObject(const wxBitmap& bitmap);

include/wx/dfb/dcmemory.h

@@ -17,7 +17,7 @@
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC(wxDC *dc); // create compatible DC
 
     virtual void SelectObject(const wxBitmap& bitmap);

include/wx/gtk/dcmemory.h

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC;
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
     virtual void SelectObject( const wxBitmap& bitmap );

include/wx/gtk1/dcmemory.h

@@ -26,7 +26,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC;
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
     virtual void SelectObject( const wxBitmap& bitmap );

include/wx/mac/carbon/dcmemory.h

@@ -19,7 +19,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
   public:
-    wxMemoryDC(void);
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );

include/wx/mac/classic/dcmemory.h

@@ -19,7 +19,7 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
   DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
   public:
-    wxMemoryDC(void);
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );

include/wx/mgl/dcmemory.h

@@ -26,7 +26,7 @@ class WXDLLEXPORT wxMemoryDC;
 class WXDLLEXPORT wxMemoryDC : public wxDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC(wxDC *dc); // Create compatible DC
     virtual ~wxMemoryDC();
     virtual void SelectObject(const wxBitmap& bitmap);

include/wx/motif/dcmemory.h

@@ -19,7 +19,7 @@ class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
 

include/wx/msw/dcmemory.h

@@ -17,7 +17,7 @@
 class WXDLLEXPORT wxMemoryDC : public wxDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC(wxDC *dc); // Create compatible DC
 
     virtual void SelectObject(const wxBitmap& bitmap);

include/wx/os2/dcmemory.h

@@ -17,7 +17,7 @@
 class WXDLLEXPORT wxMemoryDC: public wxDC
 {
 public:
-    wxMemoryDC(void);
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC(wxDC* pDC); // Create compatible DC
 
     virtual void SelectObject(const wxBitmap& rBitmap);

include/wx/palmos/dcmemory.h

@@ -17,7 +17,7 @@
 class WXDLLEXPORT wxMemoryDC : public wxDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC(wxDC *dc); // Create compatible DC
 
     virtual void SelectObject(const wxBitmap& bitmap);

include/wx/x11/dcmemory.h

@@ -17,7 +17,7 @@
 class WXDLLIMPEXP_CORE wxMemoryDC : public wxWindowDC
 {
 public:
-    wxMemoryDC();
+    wxMemoryDC( const wxBitmap& bitmap = wxNullBitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC();
     virtual void SelectObject( const wxBitmap& bitmap );

src/cocoa/dcmemory.mm

@@ -30,10 +30,13 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
     m_cocoaNSImage = NULL;
     m_ok = false;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

src/dfb/dcmemory.cpp

@@ -39,8 +39,10 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 
-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc))

src/gtk/dcmemory.cpp

@@ -21,7 +21,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC() : wxWindowDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+   : wxWindowDC()
 {
     m_ok = false;
 
@@ -33,6 +34,9 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
     pango_context_set_language( m_context, gtk_get_default_language() );
     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

src/gtk1/dcmemory.cpp

@@ -21,11 +21,15 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC() : wxWindowDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+    : wxWindowDC()
 {
     m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

src/mac/carbon/dcmemory.cpp

@@ -21,7 +21,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 : m_selected()
 {
     m_ok = true;
@@ -30,6 +30,9 @@ wxMemoryDC::wxMemoryDC()
     SetPen(*wxBLACK_PEN);
     SetFont(*wxNORMAL_FONT);
     m_ok = false;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

src/mac/classic/dcmemory.cpp

@@ -21,7 +21,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
           : m_selected()
 {
     m_ok = true;
@@ -29,6 +29,9 @@ wxMemoryDC::wxMemoryDC(void)
     SetBrush(*wxWHITE_BRUSH);
     SetPen(*wxBLACK_PEN);
     m_ok = false;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 };
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )

src/mgl/dcmemory.cpp

@@ -24,9 +24,13 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC() : wxDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+    : wxDC()
 {
     m_isMemDC = true;
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *WXUNUSED(dc)) : wxDC()

src/motif/dcmemory.cpp

@@ -35,7 +35,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxWindowDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
     m_ok = true;
     m_display = wxGetDisplay();
@@ -57,6 +57,9 @@ wxMemoryDC::wxMemoryDC(void)
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+    
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC* dc )

src/msw/dcmemory.cpp

@@ -47,11 +47,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 // wxMemoryDC
 // ----------------------------------------------------------------------------
 
-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
     CreateCompatible(NULL);
 
     Init();
+    
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *dc)

src/os2/dcmemory.cpp

@@ -28,10 +28,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 // Memory DC
 /////////////////////////////////////////////////////////////////////////////
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
     CreateCompatible(NULL);
     Init();
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 } // end of wxMemoryDC::wxMemoryDC
 
 wxMemoryDC::wxMemoryDC(

src/palmos/dcmemory.cpp

@@ -45,8 +45,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
 // wxMemoryDC
 // ----------------------------------------------------------------------------
 
-wxMemoryDC::wxMemoryDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
 {
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC(wxDC *dc)

src/x11/dcmemory.cpp

@@ -23,7 +23,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC() : wxWindowDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+    : wxWindowDC()
 {
     m_ok = false;
 
@@ -31,6 +32,9 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
 
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )