cleanup:

    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

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 45647bbf925587ed250fd65833e8e5abaaf2e1d3..b09517beda2d4905cdd6f391948cb8b0d375e19e 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -8,14 +8,6 @@
 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -23,6 +15,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_SEARCHCTRL
+
+#include "wx/srchctrl.h"
+

 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/dcclient.h"
 #ifndef WX_PRECOMP
     #include "wx/button.h"
     #include "wx/dcclient.h"


@@ -30,16 +26,11 @@
     #include "wx/dcmemory.h"
 #endif //WX_PRECOMP
 
     #include "wx/dcmemory.h"
 #endif //WX_PRECOMP
 

-#if wxUSE_SEARCHCTRL
-
-#include "wx/srchctrl.h"
-

 #if !wxUSE_NATIVE_SEARCH_CONTROL
 
 #include "wx/image.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
 
 // ----------------------------------------------------------------------------
 // constants


@@ -239,8 +230,6 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
 
     m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
 
 
     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);
 
     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;
     }
         // no change
         return;
     }

+    bool hadMenu = (m_menu != NULL);

     delete m_menu;
     delete m_menu;

-    bool hadMenu = (m_menu!=0);

     m_menu = menu;
 
     if ( m_menu && !hadMenu )
     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 )
     {
     bool result = wxSearchCtrlBase::SetFont(font);
     if ( result && m_text )
     {

-        result &= m_text->SetFont(font);
+        result = m_text->SetFont(font);

     }
     RecalcBitmaps();
     return result;
     }
     RecalcBitmaps();
     return result;