pass correct tool id (and not always -1) to EVT_TOOL_RCLICKED() handler

[wxWidgets.git] / src / gtk / renderer.cpp

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 7e8587f80dbcf58e7075040bd615bd4151e29084..952cfeb3e4eae0600bc4c7c28774410dbc2f5ea9 100644 (file)
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>

-// License:     wxWindows license
+// License:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -24,15 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif // WX_PRECOMP
-
+#include "wx/renderer.h"

 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/window.h"
 #include "wx/dc.h"
 #include <gtk/gtk.h>
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/window.h"
 #include "wx/dc.h"

-#include "wx/renderer.h"

 
 #ifdef __WXGTK20__
     #include "wx/settings.h"
 
 #ifdef __WXGTK20__
     #include "wx/settings.h"


@@ -285,7 +282,7 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
 {
     if ( !win->m_wxwindow->window )
     {
 {
     if ( !win->m_wxwindow->window )
     {

-        // VZ: this happens on startup -- why?
+        // window not realized yet

         return;
     }
 
         return;
     }
 


@@ -296,12 +293,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     GdkRectangle erase_rect;
     if ( isVert )
     {
     GdkRectangle erase_rect;
     if ( isVert )
     {

-    int h = win->GetClientSize().GetHeight();
+        int h = win->GetClientSize().GetHeight();

     
         rect.x = position;
     
         rect.x = position;

-        rect.y = h/2 - 14/2;
+        rect.y = 0;

         rect.width = SASH_FULL_SIZE;
         rect.width = SASH_FULL_SIZE;

-        rect.height = 14;
+        rect.height = h;

     
         erase_rect.x = position;
         erase_rect.y = 0;
     
         erase_rect.x = position;
         erase_rect.y = 0;


@@ -310,12 +307,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     }
     else // horz
     {
     }
     else // horz
     {

-    int w = win->GetClientSize().GetWidth();
+        int w = win->GetClientSize().GetWidth();

     
     

-        rect.x = w/2 - 14/2;
+        rect.x = 0;

         rect.y = position;
         rect.height = SASH_FULL_SIZE;
         rect.y = position;
         rect.height = SASH_FULL_SIZE;

-        rect.width = 14;
+        rect.width = w;

     
         erase_rect.y = position;
         erase_rect.x = 0;
     
         erase_rect.y = position;
         erase_rect.x = 0;