Minor header cleaning.

[wxWidgets.git] / src / x11 / dcmemory.cpp

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index 65affeed87a40ad7bcd75c6e8266073025942283..f5a4bddb6455fe576db0706f6c38d0f6ad1677ce 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -1,43 +1,49 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/x11/dcmemory.cpp

 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxMemoryDC class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcmemory.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/dcmemory.h"
 
 #include "wx/dcmemory.h"

-#include "wx/settings.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+#endif

 
 #include "wx/x11/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 #include "wx/x11/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

-wxMemoryDC::wxMemoryDC() : wxWindowDC()
+wxMemoryDC::wxMemoryDC( const wxBitmap& bitmap )
+    : wxWindowDC()

 {
 {

-    m_ok = FALSE;
-    
+    m_ok = false;
+

     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );

+
+    if ( bitmap.IsOk() )
+        SelectObject(bitmap);

 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_display = (WXDisplay *) wxGlobalDisplay();
 
     m_display = (WXDisplay *) wxGlobalDisplay();

-    
+

     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
 }
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_cmap = (WXColormap) DefaultColormap( wxGlobalDisplay(), screen );
 }


@@ -49,7 +55,7 @@ wxMemoryDC::~wxMemoryDC()
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
     Destroy();
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
     Destroy();

-    
+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {


@@ -62,13 +68,13 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

-        m_isMemDC = TRUE;
+        m_isMemDC = true;

 
         SetUpDC();
     }
     else
     {
 
         SetUpDC();
     }
     else
     {

-        m_ok = FALSE;
+        m_ok = false;

         m_window = NULL;
     }
 }
         m_window = NULL;
     }
 }