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

fix virtual function hiding warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-03 09:20:11 +00:00
parent 834fcdd949
commit d1b8a7430f
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/gtk1/bmpbuttn.h
View File

@@ -51,8 +51,8 @@ public:
// implementation // implementation
// -------------- // --------------
void HasFocus(); void GTKSetHasFocus();
void NotFocus(); void GTKSetNotFocus();
void StartSelect(); void StartSelect();
void EndSelect(); void EndSelect();
void DoApplyWidgetStyle(GtkRcStyle *style); void DoApplyWidgetStyle(GtkRcStyle *style);

8
src/gtk1/bmpbuttn.cpp
View File

@@ -64,7 +64,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
if (!button->m_hasVMT) return; if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
button->HasFocus(); button->GTKSetHasFocus();
} }
} }
@@ -78,7 +78,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
if (!button->m_hasVMT) return; if (!button->m_hasVMT) return;
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
button->NotFocus(); button->GTKSetNotFocus();
} }
} }
@@ -240,13 +240,13 @@ bool wxBitmapButton::Enable( bool enable )
return true; return true;
} }
void wxBitmapButton::HasFocus() void wxBitmapButton::GTKSetHasFocus()
{ {
m_hasFocus = true; m_hasFocus = true;
OnSetBitmap(); OnSetBitmap();
} }
void wxBitmapButton::NotFocus() void wxBitmapButton::GTKSetNotFocus()
{ {
m_hasFocus = false; m_hasFocus = false;
OnSetBitmap(); OnSetBitmap();

8
src/gtk1/renderer.cpp
View File

@@ -51,7 +51,9 @@ public:
virtual void DrawHeaderButton(wxWindow *win, virtual void DrawHeaderButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0
wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
wxHeaderButtonParams* params=NULL);
virtual void DrawSplitterBorder(wxWindow *win, virtual void DrawSplitterBorder(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -125,7 +127,9 @@ void
wxRendererGTK::DrawHeaderButton(wxWindow *win, wxRendererGTK::DrawHeaderButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags) int flags,
wxHeaderSortIconType WXUNUSED(sortArrow),
wxHeaderButtonParams* WXUNUSED(params))
{ {
GtkWidget *button = GetButtonWidget(); GtkWidget *button = GetButtonWidget();