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

diff --git a/docs/changes.txt b/docs/changes.txt
index 089088fef25d15fcca69bdd9de12c2c7de6d0157..e18d24de6eee99c99494516aad0d70081830953a 100644 (file)
--- a/docs/changes.txt
+++ b/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
 -----
 

diff --git a/docs/latex/wx/memorydc.tex b/docs/latex/wx/memorydc.tex
index 8f4c510d2b7f68c3aa2d4634f0a321db9e0ca7a5..eadaa1d9919b73acc45b94e2414f81b0e1b93df9 100644 (file)
--- a/docs/latex/wx/memorydc.tex
+++ b/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}
 

diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h
index e6580bab961f74a1f1447757fab3b3566a3d461c..6a09f4fb42de52801b82aa77fccd6b6c9151b86d 100644 (file)
--- a/include/wx/cocoa/dcmemory.h
+++ b/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);

diff --git a/include/wx/dfb/dcmemory.h b/include/wx/dfb/dcmemory.h
index dbb0e955c8b56cc2a197497bb8ee19508d3a0dc6..86ce650a72be3e07e83c961c1e3c598012dfd0f5 100644 (file)
--- a/include/wx/dfb/dcmemory.h
+++ b/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);

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index b4e6be4c82a74ddd79747ddfb783582d510ab2e5..0dbded2feba9bf658e6519f974f0cc4d147a0435 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/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 );

diff --git a/include/wx/gtk1/dcmemory.h b/include/wx/gtk1/dcmemory.h
index c998df979e65d8bbd676508d10955563d4cf7135..ba5b573e5fde8d32cbde7e5641ee78fd0d8b75fc 100644 (file)
--- a/include/wx/gtk1/dcmemory.h
+++ b/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 );

diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h
index bc6f99ee3ae27390300056bcbbb34c614a42451a..9e1045c8bd9110123c0b459b4732ca1c72375495 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/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 );

diff --git a/include/wx/mac/classic/dcmemory.h b/include/wx/mac/classic/dcmemory.h
index c9780e2c68f47776727b7768c96aae5eba0235c6..4a2c8f191e937b75189d125b8ffea6c2ddfc6a6d 100644 (file)
--- a/include/wx/mac/classic/dcmemory.h
+++ b/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 );

diff --git a/include/wx/mgl/dcmemory.h b/include/wx/mgl/dcmemory.h
index 73407d12f96504e40d53124a538abc7f61c9be06..8bda585ff4ab37b2fcc3a7b765eb8535597db485 100644 (file)
--- a/include/wx/mgl/dcmemory.h
+++ b/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);

diff --git a/include/wx/motif/dcmemory.h b/include/wx/motif/dcmemory.h
index 121dda66041079b25ee626bbc05e7a3ad4112ab2..0d453f55058b1457f9a302dc852d628d42965418 100644 (file)
--- a/include/wx/motif/dcmemory.h
+++ b/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();
 

diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h
index 39de2e1702ce0729b0b395cec1eb7125ce33ff6f..1e138b2e329f7f0cfdaccf813f2a038bf7ff2202 100644 (file)
--- a/include/wx/msw/dcmemory.h
+++ b/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);

diff --git a/include/wx/os2/dcmemory.h b/include/wx/os2/dcmemory.h
index f0484a8dee95985f883e9457ac10e860016741ba..33001f619e7cf9fc6e5d0ba08a65f440d252a644 100644 (file)
--- a/include/wx/os2/dcmemory.h
+++ b/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);

diff --git a/include/wx/palmos/dcmemory.h b/include/wx/palmos/dcmemory.h
index be87436f969b7cf7e5f59c7653e3fa86d41e4304..56d6c305f497b95a618c02df4b67704138b2b695 100644 (file)
--- a/include/wx/palmos/dcmemory.h
+++ b/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);

diff --git a/include/wx/x11/dcmemory.h b/include/wx/x11/dcmemory.h
index a9d5ebd7f7d2f479b6078a6877ee5b36187b44f3..40c97fc7f0ab715b0f01292c9ff76eb1dde5309e 100644 (file)
--- a/include/wx/x11/dcmemory.h
+++ b/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 );

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index 218fb4ff8eedccfb39f61e9f409530de46d6ebe8..bf3920f49e29d76b86ec180bab50194a01dc14d3 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/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) )

diff --git a/src/dfb/dcmemory.cpp b/src/dfb/dcmemory.cpp
index bb9171db678b6664bc5e82e0da41ffaa4e25bc14..036fcb81e108287e965a9c9f3fcdf4877386c071 100644 (file)
--- a/src/dfb/dcmemory.cpp
+++ b/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))

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index b57a4b8aa81223581bb44e9e2584020ff0197eea..f24a06e95eb971cae9f656d265781f7366bd6698 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/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) )

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 713e58e881250c040554ceba76b4e564997cc207..add3cc54f5daaa05e60b344f38806f3e52952c35 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/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) )

diff --git a/src/mac/carbon/dcmemory.cpp b/src/mac/carbon/dcmemory.cpp
index 20c371825af51e65a5c6f61b41befb7df171fee8..ee44e18330239ec7a8548e5dfa571feffe1a7769 100644 (file)
--- a/src/mac/carbon/dcmemory.cpp
+++ b/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) )

diff --git a/src/mac/classic/dcmemory.cpp b/src/mac/classic/dcmemory.cpp
index 32949efa7524951e4ab82a6542504e03af1c2e26..ad765139d9802c5b63aac4a09c4b8bb6767b3873 100644 (file)
--- a/src/mac/classic/dcmemory.cpp
+++ b/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) )

diff --git a/src/mgl/dcmemory.cpp b/src/mgl/dcmemory.cpp
index c6c4233795bc6b9d01d99c59c9e57a04160e389d..6017861c05c98fb6e2e121ad9c22b0af5533d278 100644 (file)
--- a/src/mgl/dcmemory.cpp
+++ b/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()

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 0f2eb13bff554ac5eb85b8703b5866a1a7c80609..789dac864d6848c09506ed7f5e7ea43683e45b84 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/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 )

diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp
index e68fe93b107ec32a52df9784bbac9fc2020f70ad..36ff844b21afd6fe69fceee841d2af95641094bc 100644 (file)
--- a/src/msw/dcmemory.cpp
+++ b/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)

diff --git a/src/os2/dcmemory.cpp b/src/os2/dcmemory.cpp
index b42e3844419cdd6a00ec961bbd76c973ff1e0048..770e42bce458316b084417df267d767f9031c381 100644 (file)
--- a/src/os2/dcmemory.cpp
+++ b/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(

diff --git a/src/palmos/dcmemory.cpp b/src/palmos/dcmemory.cpp
index 461b478a5390730bd684c0bd3920a1348c0ebcc4..96487eba36b0831a7db43ad2ee2421c8c2fe7484 100644 (file)
--- a/src/palmos/dcmemory.cpp
+++ b/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)

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 0b2f67aad78f1a0aa43a897b8173ecad276f7e9e..f5a4bddb6455fe576db0706f6c38d0f6ad1677ce 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/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) )