Added Set/GetQuickBestSize

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

diff --git a/src/x11/dcmemory.cpp b/src/x11/dcmemory.cpp
index aa2132140d514278749e8fda88dc9e96ab9e7a51..810e55f83ea07d44e323eb8a1df7acc054d33184 100644 (file)
--- a/src/x11/dcmemory.cpp
+++ b/src/x11/dcmemory.cpp
@@ -1,21 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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

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

-#ifdef __GNUG__
-#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"

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

 #include "wx/settings.h"
 #include "wx/settings.h"

-#include "wx/utils.h"

 
 #include "wx/x11/private.h"
 
 
 #include "wx/x11/private.h"
 


@@ -23,8 +26,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
 
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {

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

     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );
     m_display = (WXDisplay *) wxGlobalDisplay();
 
     int screen = DefaultScreen( wxGlobalDisplay() );


@@ -34,10 +37,10 @@ wxMemoryDC::wxMemoryDC() : wxWindowDC()
 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 +52,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 +65,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;
     }
 }