get rid of wxClientDC::m_oldFont, it wasn't really used (this fixes crash introduced...

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index fa04c08521adbb5202e8c1d98a983ce5bb141474..8522c8e23b71c3ac0db2762f1373c7adc95997f7 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -168,6 +168,12 @@ protected:
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp

+
+    // this is useless and should be removed, kept for now just for backwards
+    // compatibility
+#if wxCHECK_VERSION(2, 7, 0)
+    #error "Remove wxClientDC::m_oldFont"
+#endif

     WXFont       m_oldFont;
 };
 
     WXFont       m_oldFont;
 };
 

diff --git a/src/motif/dcclient.cpp b/src/motif/dcclient.cpp
index 3ab64e342524e801f7422dc1868164eafbeef0dd..6bd956c0bd6c2baacb40e87854c7ed93841f8406 100644 (file)
--- a/src/motif/dcclient.cpp
+++ b/src/motif/dcclient.cpp
@@ -199,24 +199,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 
     m_backgroundPixel = (int) gcvalues.background;
 
 
     m_backgroundPixel = (int) gcvalues.background;
 

-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;
-

     SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
 }
 
 wxWindowDC::~wxWindowDC()
 {
     SetBackground(wxBrush(m_window->GetBackgroundColour(), wxSOLID));
 }
 
 wxWindowDC::~wxWindowDC()
 {

-    if (m_gc && m_oldFont)
-    {
-        XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
-
-        if (m_window && m_window->GetBackingPixmap())
-            XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
-    }
-

     if (m_gc)
         XFreeGC ((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) 0;
     if (m_gc)
         XFreeGC ((Display*) m_display, (GC) m_gc);
     m_gc = (WXGC) 0;


@@ -1415,13 +1402,6 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     if (!m_font.Ok())
     {
 
     if (!m_font.Ok())
     {

-        if (m_oldFont)
-        {
-            XSetFont ((Display*) m_display, (GC) m_gc, (Font) m_oldFont);
-
-            if (m_window && m_window->GetBackingPixmap())
-                XSetFont ((Display*) m_display,(GC) m_gcBacking, (Font) m_oldFont);
-        }

         return;
     }
 
         return;
     }
 

diff --git a/src/motif/dcmemory.cpp b/src/motif/dcmemory.cpp
index 98cd0efd3e5c15c20f3f29e991574ee3231ce105..546dc4417c09e98fac6c0afd9038833f0c31abcd 100644 (file)
--- a/src/motif/dcmemory.cpp
+++ b/src/motif/dcmemory.cpp
@@ -55,10 +55,6 @@ wxMemoryDC::wxMemoryDC(void)
 
     m_backgroundPixel = (int) gcvalues.background;
 
 
     m_backgroundPixel = (int) gcvalues.background;
 

-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;

     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
     SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));


@@ -86,10 +82,6 @@ wxMemoryDC::wxMemoryDC( wxDC* dc )
 
     m_backgroundPixel = (int) gcvalues.background;
 
 
     m_backgroundPixel = (int) gcvalues.background;
 

-    // Get the current Font so we can set it back later
-    XGCValues valReturn;
-    XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-    m_oldFont = (WXFont) valReturn.font;

     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
 };
     SetBrush (* wxWHITE_BRUSH);
     SetPen (* wxBLACK_PEN);
 };


@@ -124,11 +116,6 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         m_backgroundPixel = (int) gcvalues.background;
         m_ok = true;
 
         m_backgroundPixel = (int) gcvalues.background;
         m_ok = true;
 

-        // Get the current Font so we can set it back later
-        XGCValues valReturn;
-        XGetGCValues((Display*) m_display, (GC) m_gc, GCFont, &valReturn);
-        m_oldFont = (WXFont) valReturn.font;
-

         SetBrush (* wxWHITE_BRUSH);
         SetPen (* wxBLACK_PEN);
     }
         SetBrush (* wxWHITE_BRUSH);
         SetPen (* wxBLACK_PEN);
     }