AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2008-01-21 15:03:10 +00:00
parent 56465170cc
commit 7f35e5eeca
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

16
src/gtk/bmpbuttn.cpp
View File

@ -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();