Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup:

Browse Source 
wrap everything in #if wxUSE_SEARCHCTRL,
    implementation include comes first,
    parenthesize macro replacement containing operators,
    unused variable,
    use of pointer after delete,
    bizarre boolean expression


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-11 18:33:58 +00:00
parent 70b63a9909
commit 09d93215cf
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/generic/srchctlg.cpp
View File

@@ -8,14 +8,6 @@
// License: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@ -23,6 +15,10 @@
#pragma hdrstop
#endif
#if wxUSE_SEARCHCTRL
#include "wx/srchctrl.h"
#ifndef WX_PRECOMP
#include "wx/button.h"
#include "wx/dcclient.h"
@@ -30,16 +26,11 @@
#include "wx/dcmemory.h"
#endif //WX_PRECOMP
#if wxUSE_SEARCHCTRL
#include "wx/srchctrl.h"
#if !wxUSE_NATIVE_SEARCH_CONTROL
#include "wx/image.h"
#define WXMIN(a,b) (a)<(b)?(a):(b)
#define WXMAX(a,b) (a)>(b)?(a):(b)
#define WXMAX(a,b) ((a)>(b)?(a):(b))
// ----------------------------------------------------------------------------
// constants
@@ -239,8 +230,6 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
wxSize sizeText = m_text->GetBestSize();
m_searchButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_SEARCH,m_searchBitmap);
m_cancelButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_CANCEL,m_cancelBitmap);
@@ -276,8 +265,8 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
// no change
return;
}
bool hadMenu = (m_menu != NULL);
delete m_menu;
bool hadMenu = (m_menu!=0);
m_menu = menu;
if ( m_menu && !hadMenu )
@@ -692,7 +681,7 @@ bool wxSearchCtrl::SetFont(const wxFont& font)
bool result = wxSearchCtrlBase::SetFont(font);
if ( result && m_text )
{
result &= m_text->SetFont(font);
result = m_text->SetFont(font);
}
RecalcBitmaps();
return result;