fix virtual function hiding warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index da79870b6c0881953bbfafee95c66b6f7bbabe5f..726d4babcb7a1af074a5a84649d96d8d2a51cceb 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -51,8 +51,8 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    void HasFocus();
-    void NotFocus();
+    void GTKSetHasFocus();
+    void GTKSetNotFocus();

     void StartSelect();
     void EndSelect();
     void DoApplyWidgetStyle(GtkRcStyle *style);
     void StartSelect();
     void EndSelect();
     void DoApplyWidgetStyle(GtkRcStyle *style);

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index d65eaae68aa84446118a1c5af773b51f620e7610..068f6351a319582e2fcec6355bf849a822a0bf15 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -64,7 +64,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) 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 (g_blockEventsOnDrag) return;
 
     if (!button->m_hasVMT) 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;
     OnSetBitmap();
 }
 
 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 

-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKSetNotFocus()

 {
     m_hasFocus = false;
     OnSetBitmap();
 {
     m_hasFocus = false;
     OnSetBitmap();

diff --git a/src/gtk1/renderer.cpp b/src/gtk1/renderer.cpp
index 96ceee484aa0f34c5a1324c71d9d364d672f4a5d..af0a4bd945a7c6bd93673a6fc922e5a099b6fc37 100644 (file)
--- a/src/gtk1/renderer.cpp
+++ b/src/gtk1/renderer.cpp
@@ -51,7 +51,9 @@ public:
     virtual void DrawHeaderButton(wxWindow *win,
                                   wxDC& dc,
                                   const wxRect& rect,
     virtual void DrawHeaderButton(wxWindow *win,
                                   wxDC& dc,
                                   const wxRect& rect,

-                                  int flags = 0);
+                                  int flags = 0
+                                  wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE,
+                                  wxHeaderButtonParams* params=NULL);

 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,
 
     virtual void DrawSplitterBorder(wxWindow *win,
                                     wxDC& dc,


@@ -125,7 +127,9 @@ void
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,
 wxRendererGTK::DrawHeaderButton(wxWindow *win,
                                 wxDC& dc,
                                 const wxRect& rect,

-                                int flags)
+                                int flags,
+                                wxHeaderSortIconType WXUNUSED(sortArrow),
+                                wxHeaderButtonParams* WXUNUSED(params))

 {
 
     GtkWidget *button = GetButtonWidget();
 {
 
     GtkWidget *button = GetButtonWidget();