From 7f35e5eeca672d1772daec728fbea68d668bc4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Mon, 21 Jan 2008 15:03:10 +0000
Subject: [PATCH] prefix implementation methods of wxBitmapButton with 'GTK' to
 prevent shadowing of HasFocus

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/bmpbuttn.h |  8 ++++----
 src/gtk/bmpbuttn.cpp      | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 68fe9bb8a4..19eb664d1c 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -51,10 +51,10 @@ public:
     // implementation
     // --------------
 
-    void HasFocus();
-    void NotFocus();
-    void StartSelect();
-    void EndSelect();
+    void GTKHasFocus();
+    void GTKNotFocus();
+    void GTKStartSelect();
+    void GTKEndSelect();
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;
diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 2954d03cf7..ac1cec221d 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -54,7 +54,7 @@ static void gtk_bmpbutton_enter_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->HasFocus();
+    button->GTKHasFocus();
 }
 }
 
@@ -68,7 +68,7 @@ static void gtk_bmpbutton_leave_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->NotFocus();
+    button->GTKNotFocus();
 }
 }
 
@@ -82,7 +82,7 @@ static void gtk_bmpbutton_press_callback( GtkWidget *WXUNUSED(widget), wxBitmapB
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->StartSelect();
+    button->GTKStartSelect();
 }
 }
 
@@ -96,7 +96,7 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
-    button->EndSelect();
+    button->GTKEndSelect();
 }
 }
 
@@ -226,25 +226,25 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKHasFocus()
 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::NotFocus()
+void wxBitmapButton::GTKNotFocus()
 {
     m_hasFocus = false;
     OnSetBitmap();
 }
 
-void wxBitmapButton::StartSelect()
+void wxBitmapButton::GTKStartSelect()
 {
     m_isSelected = true;
     OnSetBitmap();
 }
 
-void wxBitmapButton::EndSelect()
+void wxBitmapButton::GTKEndSelect()
 {
     m_isSelected = false;
     OnSetBitmap();