Don't overwrite status message when restoring it if it changed.

[wxWidgets.git] / src / gtk1 / dc.cpp

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 53b451a8f345cd3e5810e5e88cf52f6c93cac259..eb51e3807230a5efae0a11ba25747e86490db118 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -10,29 +10,22 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/dc.h"
+#include "wx/gtk1/dc.h"

 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

-// wxDC
+// wxGTKDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
+IMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl)

 
 

-wxDC::wxDC()
+wxGTKDCImpl::wxGTKDCImpl(wxDC *owner)
+           : wxDCImpl(owner)

 {
     m_ok = FALSE;
 
 {
     m_ok = FALSE;
 

-    m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() /
-                    (double)wxGetDisplaySizeMM().GetWidth();
-    m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
-                    (double)wxGetDisplaySizeMM().GetHeight();
-
-    m_needComputeScaleX = FALSE; /* not used yet */
-    m_needComputeScaleY = FALSE; /* not used yet */
-

     m_logicalFunction = wxCOPY;
 
     m_pen = *wxBLACK_PEN;
     m_logicalFunction = wxCOPY;
 
     m_pen = *wxBLACK_PEN;


@@ -40,7 +33,7 @@ wxDC::wxDC()
     m_brush = *wxWHITE_BRUSH;
 }
 
     m_brush = *wxWHITE_BRUSH;
 }
 

-void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
+void wxGTKDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
     m_clipping = TRUE;
     m_clipX1 = x;
 {
     m_clipping = TRUE;
     m_clipX1 = x;


@@ -53,7 +46,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
 // get DC capabilities
 // ---------------------------------------------------------------------------
 
 // get DC capabilities
 // ---------------------------------------------------------------------------
 

-void wxDC::DoGetSizeMM( int* width, int* height ) const
+void wxGTKDCImpl::DoGetSizeMM( int* width, int* height ) const

 {
     int w = 0;
     int h = 0;
 {
     int w = 0;
     int h = 0;


@@ -63,7 +56,7 @@ void wxDC::DoGetSizeMM( int* width, int* height ) const
 }
 
 // Resolution in pixels per logical inch
 }
 
 // Resolution in pixels per logical inch

-wxSize wxDC::GetPPI() const
+wxSize wxGTKDCImpl::GetPPI() const

 {
     // TODO (should probably be pure virtual)
     return wxSize(0, 0);
 {
     // TODO (should probably be pure virtual)
     return wxSize(0, 0);