prefix implementation methods of wxBitmapButton with 'GTK' to prevent shadowing of...

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 68fe9bb8a4a4f0f586945618892b9379dac0f921..19eb664d1c7cff06b00267b423be9ca31c0d12c2 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -51,10 +51,10 @@ public:
     // implementation
     // --------------
 
     // 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;
 
     bool         m_hasFocus:1;
     bool         m_isSelected:1;

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 2954d03cf7a89046446712744e2e9c257fe2f300..ac1cec221d1a2f36b7e528fa3d64d348c47506e8 100644 (file)
--- 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;
 
     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;
 
     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;
 
     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;
 
     if (!button->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 

-    button->EndSelect();
+    button->GTKEndSelect();

 }
 }
 
 }
 }
 


@@ -226,25 +226,25 @@ bool wxBitmapButton::Enable( bool enable )
     return true;
 }
 
     return true;
 }
 

-void wxBitmapButton::HasFocus()
+void wxBitmapButton::GTKHasFocus()

 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 
 {
     m_hasFocus = true;
     OnSetBitmap();
 }
 

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

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

-void wxBitmapButton::StartSelect()
+void wxBitmapButton::GTKStartSelect()

 {
     m_isSelected = true;
     OnSetBitmap();
 }
 
 {
     m_isSelected = true;
     OnSetBitmap();
 }
 

-void wxBitmapButton::EndSelect()
+void wxBitmapButton::GTKEndSelect()

 {
     m_isSelected = false;
     OnSetBitmap();
 {
     m_isSelected = false;
     OnSetBitmap();