fixed more printf() warnings

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

diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp
index c66c5f4797e8e32c624b8569937e19f7f2793e94..aeef76c8fd26e6ba081191c6b082559f737616bb 100644 (file)
--- a/src/x11/dc.cpp
+++ b/src/x11/dc.cpp
@@ -38,44 +38,28 @@ wxDC::wxDC()
 {
     m_ok = FALSE;
 
 {
     m_ok = FALSE;
 

+#if 1

     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;
     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;

+#else
+    m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() /
+                    (double)wxGetDisplaySizeMM().GetWidth();
+    m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
+                    (double)wxGetDisplaySizeMM().GetHeight();
+#endif

 
 

-    m_backgroundMode = wxTRANSPARENT;
-
-    m_isInteractive = FALSE;
-}
-
-void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)
-{
-    wxCHECK_RET( Ok(), "invalid dc" );
-    wxCHECK_RET( icon.Ok(), "invalid icon" );
-
-    DoDrawBitmap(icon, x, y, TRUE);
-}
-
-void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )
-{
-    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+    m_needComputeScaleX = FALSE; /* not used yet */
+    m_needComputeScaleY = FALSE; /* not used yet */

 
 

-    wxMemoryDC memDC;
-    memDC.SelectObject(bitmap);
+    m_logicalFunction = wxCOPY;

 
 

-#if 0
-    // Not sure if we need this. The mask should leave the masked areas as per
-    // the original background of this DC.
-    if (useMask)
-    {
-        // There might be transparent areas, so make these the same colour as this
-        // DC
-        memDC.SetBackground(* GetBackground());
-        memDC.Clear();
-    }
-#endif // 0
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;

 
 

-    Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), &memDC, 0, 0, wxCOPY, useMask);
+    m_backgroundMode = wxTRANSPARENT;

 
 

-    memDC.SelectObject(wxNullBitmap);
+    m_isInteractive = FALSE;  // ???

 }
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 }
 
 void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )


@@ -92,14 +76,6 @@ void wxDC::DestroyClippingRegion()
     m_clipping = FALSE;
 }
 
     m_clipping = FALSE;
 }
 

-void wxDC::DoGetSize( int* width, int* height ) const
-{
-    if ( width )
-        *width = m_maxX - m_minX;
-    if ( height )
-        *height = m_maxY - m_minY;
-}
-

 void wxDC::DoGetSizeMM( int* width, int* height ) const
 {
     int w, h;
 void wxDC::DoGetSizeMM( int* width, int* height ) const
 {
     int w, h;