Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just remove some unnecessary casts.

Browse Source 
Use correct GdkRectangle* type for wxDataViewCustomRenderer::xxx_area members
instead of casting them to and from void*.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-10 17:41:28 +00:00
parent c2a738e372
commit 70884c6fc8
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/gtk/dvrenderers.h
View File

@@ -12,6 +12,8 @@
#ifndef _WX_GTK_DVRENDERERS_H_ #ifndef _WX_GTK_DVRENDERERS_H_
#define _WX_GTK_DVRENDERERS_H_ #define _WX_GTK_DVRENDERERS_H_
typedef struct _GdkRectangle GdkRectangle;
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewTextRenderer // wxDataViewTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
@@ -124,9 +126,9 @@ public:
GtkCellRenderer *m_text_renderer; GtkCellRenderer *m_text_renderer;
GdkWindow *window; GdkWindow *window;
GtkWidget *widget; GtkWidget *widget;
void *background_area; GdkRectangle *background_area;
void *cell_area; GdkRectangle *cell_area;
void *expose_area; GdkRectangle *expose_area;
int flags; int flags;
protected: protected:

22
src/gtk/dataview.cpp
View File

@@ -1224,10 +1224,10 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer,
cell->window = window; cell->window = window;
cell->widget = widget; cell->widget = widget;
cell->background_area = (void*) background_area; cell->background_area = background_area;
cell->cell_area = (void*) cell_area; cell->cell_area = cell_area;
cell->expose_area = (void*) expose_area; cell->expose_area = expose_area;
cell->flags = (int) flags; cell->flags = flags;
GdkRectangle rect; GdkRectangle rect;
gtk_wx_cell_renderer_get_size (renderer, widget, cell_area, gtk_wx_cell_renderer_get_size (renderer, widget, cell_area,
@@ -2064,19 +2064,19 @@ void wxDataViewCustomRenderer::RenderText( const wxString &text, int xoffset,
g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue ); g_object_set_property( G_OBJECT(m_text_renderer), "text", &gvalue );
g_value_unset( &gvalue ); g_value_unset( &gvalue );
((GdkRectangle*) cell_area)->x += xoffset; cell_area->x += xoffset;
((GdkRectangle*) cell_area)->width -= xoffset; cell_area->width -= xoffset;
gtk_cell_renderer_render( m_text_renderer, gtk_cell_renderer_render( m_text_renderer,
window, window,
widget, widget,
(GdkRectangle*) background_area, background_area,
(GdkRectangle*) cell_area, cell_area,
(GdkRectangle*) expose_area, expose_area,
(GtkCellRendererState) flags ); (GtkCellRendererState) flags );
((GdkRectangle*) cell_area)->x -= xoffset; cell_area->x -= xoffset;
((GdkRectangle*) cell_area)->width += xoffset; cell_area->width += xoffset;
#endif #endif
} }