don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/x11/dcscreen.cpp b/src/x11/dcscreen.cpp
index 0efabc519cd3b1994659533bc135228460594fd8..a1999ffcec2dd3f2a6cff05ea95d9729c5005f3b 100644 (file)
--- a/src/x11/dcscreen.cpp
+++ b/src/x11/dcscreen.cpp
@@ -9,7 +9,7 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dcscreen.h"
 #endif
 
 #pragma implementation "dcscreen.h"
 #endif
 


@@ -17,6 +17,8 @@
 #include "wx/frame.h"
 #include "wx/dcscreen.h"
 #include "wx/utils.h"
 #include "wx/frame.h"
 #include "wx/dcscreen.h"
 #include "wx/utils.h"

+#include "wx/app.h"
+#include "wx/fontutil.h"

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


@@ -47,6 +49,11 @@ wxScreenDC::wxScreenDC()
 
     m_isScreenDC = TRUE;
 
 
     m_isScreenDC = TRUE;
 

+#if wxUSE_UNICODE
+    m_context = wxTheApp->GetPangoContext();
+    m_fontdesc = wxNORMAL_FONT->GetNativeFontInfo()->description;
+#endif
+

     SetUpDC();
 
     XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, IncludeInferiors );
     SetUpDC();
 
     XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, IncludeInferiors );


@@ -86,24 +93,23 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
     return StartDrawingOnTop( &rect );
 }
 
     return StartDrawingOnTop( &rect );
 }
 

-bool wxScreenDC::StartDrawingOnTop( wxRect *rect )
+bool wxScreenDC::StartDrawingOnTop( wxRect *rectIn )

 {
 {

-    int x = 0;
-    int y = 0;
+    // VZ: should we do the same thing that wxMotif wxScreenDC does here?

 #if 0
 #if 0

-    int width = gdk_screen_width();
-    int height = gdk_screen_height();
-#else
-    int width = 1024;
-    int height = 768;
-#endif
-    if (rect)
+    wxRect rect;
+    if ( rectIn )
+    {
+        rect = *rectIn;
+    }
+    else

     {
     {

-        x = rect->x;
-        y = rect->y;
-        width = rect->width;
-        height = rect->height;
+        rect.x =
+        rect.y = 0;
+
+        DoGetSize(&rect.width, &rect.height);

     }
     }

+#endif // 0

 
     return TRUE;
 }
 
     return TRUE;
 }