Add scrollbars if the columns exceed the horizontal space for the control, also,...

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

diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 6df38389329e0f3e99f286a999f3639e82d537f8..d8d9176e836d8e73cf6828a4c83bbe93f1fee12d 100644 (file)
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -53,10 +53,10 @@ wxDC::wxDC()
 
 wxDC::wxDC(const wxIDirectFBSurfacePtr& surface)
 {
 
 wxDC::wxDC(const wxIDirectFBSurfacePtr& surface)
 {

-    Init(surface);
+    DFBInit(surface);

 }
 
 }
 

-void wxDC::Init(const wxIDirectFBSurfacePtr& surface)
+void wxDC::DFBInit(const wxIDirectFBSurfacePtr& surface)

 {
     m_ok = (surface != NULL);
     wxCHECK_RET( surface != NULL, _T("invalid surface") );
 {
     m_ok = (surface != NULL);
     wxCHECK_RET( surface != NULL, _T("invalid surface") );


@@ -181,9 +181,9 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
         return;
 
     wxCoord xx1 = XLOG2DEV(x1);
         return;
 
     wxCoord xx1 = XLOG2DEV(x1);

-    wxCoord yy1 = XLOG2DEV(y1);
+    wxCoord yy1 = YLOG2DEV(y1);

     wxCoord xx2 = XLOG2DEV(x2);
     wxCoord xx2 = XLOG2DEV(x2);

-    wxCoord yy2 = XLOG2DEV(y2);
+    wxCoord yy2 = YLOG2DEV(y2);

 
     // FIXME: DrawLine() shouldn't draw the last pixel, but DFB's DrawLine()
     //        does draw it. We should undo any change to the last pixel by
 
     // FIXME: DrawLine() shouldn't draw the last pixel, but DFB's DrawLine()
     //        does draw it. We should undo any change to the last pixel by