1. Renamed Set/GetXXXVisible() to ShowXXX() and IsXXXVisible()
2. Moved wxSearchCtrlBase to wx/srchctrl.h to avoid duplicating it 3. Removed gcc #pragmas git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,10 +17,6 @@
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma implementation "srchctlg.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
@@ -316,7 +312,7 @@ wxMenu* wxSearchCtrl::GetMenu()
|
||||
return m_menu;
|
||||
}
|
||||
|
||||
void wxSearchCtrl::SetSearchButtonVisible( bool show )
|
||||
void wxSearchCtrl::ShowSearchButton( bool show )
|
||||
{
|
||||
if ( m_searchButtonVisible == show )
|
||||
{
|
||||
@@ -333,13 +329,13 @@ void wxSearchCtrl::SetSearchButtonVisible( bool show )
|
||||
LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
|
||||
}
|
||||
|
||||
bool wxSearchCtrl::GetSearchButtonVisible() const
|
||||
bool wxSearchCtrl::IsSearchButtonVisible() const
|
||||
{
|
||||
return m_searchButtonVisible;
|
||||
}
|
||||
|
||||
|
||||
void wxSearchCtrl::SetCancelButtonVisible( bool show )
|
||||
void wxSearchCtrl::ShowCancelButton( bool show )
|
||||
{
|
||||
if ( m_cancelButtonVisible == show )
|
||||
{
|
||||
@@ -352,7 +348,7 @@ void wxSearchCtrl::SetCancelButtonVisible( bool show )
|
||||
LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
|
||||
}
|
||||
|
||||
bool wxSearchCtrl::GetCancelButtonVisible() const
|
||||
bool wxSearchCtrl::IsCancelButtonVisible() const
|
||||
{
|
||||
return m_cancelButtonVisible;
|
||||
}
|
||||
|
Reference in New Issue
Block a user