generate middle click events (patch 1521314)

[wxWidgets.git] / src / univ / ctrlrend.cpp

diff --git a/src/univ/ctrlrend.cpp b/src/univ/ctrlrend.cpp
index 39f549ef1eb35ab387e0cbf3b8cc87e1e541c19d..56e99ae7dd0d34b0edca259815c4bc7ef39dde33 100644 (file)
--- a/src/univ/ctrlrend.cpp
+++ b/src/univ/ctrlrend.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        univ/ctrlrend.cpp
+// Name:        src/univ/ctrlrend.cpp

 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxControlRenderer implementation
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "renderer.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -35,19 +31,15 @@
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"
     #include "wx/listbox.h"
     #include "wx/scrolbar.h"
     #include "wx/dc.h"

+    #include "wx/log.h"
+    #include "wx/gauge.h"
+    #include "wx/image.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/image.h"
-#include "wx/log.h"
-

 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 
 #include "wx/univ/theme.h"
 #include "wx/univ/renderer.h"
 #include "wx/univ/colschem.h"
 

-#if wxUSE_GAUGE
-#include "wx/gauge.h"
-#endif
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -134,6 +126,8 @@ void wxRenderer::StandardDrawTextLine(wxDC& dc,
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 
 // wxRenderer: scrollbar geometry
 // ----------------------------------------------------------------------------
 

+#if wxUSE_SCROLLBAR
+

 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,
 /* static */
 void wxRenderer::StandardScrollBarThumbSize(wxCoord length,
                                             int thumbPos,


@@ -177,7 +171,8 @@ wxRect wxRenderer::StandardGetScrollbarRect(const wxScrollBar *scrollbar,
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();
     }
 
     wxSize sizeTotal = scrollbar->GetClientSize();

-    wxCoord *start, *width, length, arrow;
+    wxCoord *start, *width;
+    wxCoord length, arrow;

     wxRect rect;
     if ( scrollbar->IsVertical() )
     {
     wxRect rect;
     if ( scrollbar->IsVertical() )
     {


@@ -392,6 +387,8 @@ wxHitTest wxRenderer::StandardHitTestScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
     }
 }
 

+#endif // wxUSE_SCROLLBAR
+

 wxRenderer::~wxRenderer()
 {
 }
 wxRenderer::~wxRenderer()
 {
 }


@@ -506,11 +503,13 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
             }
         }
     }
             }
         }
     }

+#if wxUSE_IMAGE

     else if ( stretch & wxEXPAND )
     {
         // stretch bitmap to fill the entire control
         bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
     }
     else if ( stretch & wxEXPAND )
     {
         // stretch bitmap to fill the entire control
         bmp = wxBitmap(wxImage(bmp.ConvertToImage()).Scale(rect.width, rect.height));
     }

+#endif // wxUSE_IMAGE

     else // not stretched, not tiled
     {
         if ( alignment & wxALIGN_RIGHT )
     else // not stretched, not tiled
     {
         if ( alignment & wxALIGN_RIGHT )


@@ -544,6 +543,8 @@ void wxControlRenderer::DrawBitmap(wxDC &dc,
     dc.DrawBitmap(bmp, x, y, true /* use mask */);
 }
 
     dc.DrawBitmap(bmp, x, y, true /* use mask */);
 }
 

+#if wxUSE_SCROLLBAR
+

 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                                       int WXUNUSED(thumbPosOld))
 {
 void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
                                       int WXUNUSED(thumbPosOld))
 {


@@ -654,6 +655,8 @@ void wxControlRenderer::DrawScrollbar(const wxScrollBar *scrollbar,
     }
 }
 
     }
 }
 

+#endif // wxUSE_SCROLLBAR
+

 void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     wxASSERT_MSG( x1 == x2 || y1 == y2,
 void wxControlRenderer::DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
     wxASSERT_MSG( x1 == x2 || y1 == y2,


@@ -813,7 +816,8 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect
         int steps = ((lenTotal + step - 1) * pos) / (max * step);
 
         // calc the coords of one small rect

-        wxCoord *px, dx, dy;
+        wxCoord *px;
+        wxCoord dx, dy;

         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom
         if ( gauge->IsVertical() )
         {
             // draw from bottom to top: so first set y to the bottom


@@ -870,4 +874,3 @@ void wxControlRenderer::DrawProgressBar(const wxGauge *gauge)
 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE

-