Fix VC++ compile error

[wxWidgets.git] / src / generic / srchctlg.cpp

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index b4f18fd78224f5a30da4287aee065cb8ec7bdaa0..65259a722713618644fb82034a5fb8d2edfa73fd 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -2,21 +2,12 @@
 // Name:        src/generic/srchctlg.cpp
 // Purpose:     implements wxSearchCtrl as a composite control
 // Author:      Vince Harron
 // Name:        src/generic/srchctlg.cpp
 // Purpose:     implements wxSearchCtrl as a composite control
 // Author:      Vince Harron

-// Modified by:

 // Created:     2006-02-19
 // Created:     2006-02-19

-// RCS-ID:      
+// RCS-ID:      $Id$

 // Copyright:   Vince Harron
 // Copyright:   Vince Harron

-// License:     wxWindows licence
+// Licence:     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"
 


@@ -24,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"


@@ -31,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


@@ -60,6 +50,57 @@ static const wxCoord ICON_MARGIN = 0;
 static const wxCoord ICON_OFFSET = 0;
 #endif
 
 static const wxCoord ICON_OFFSET = 0;
 #endif
 

+// ----------------------------------------------------------------------------
+// TODO: These functions or something like them should probably be made
+// public.  There are similar functions in src/aui/dockart.cpp...
+
+static double wxBlendColour(double fg, double bg, double alpha)
+{
+    double result = bg + (alpha * (fg - bg));
+    if (result < 0.0)
+        result = 0.0;
+    if (result > 255)
+        result = 255;
+    return result;
+}
+
+static wxColor wxStepColour(const wxColor& c, int ialpha)
+{
+    if (ialpha == 100)
+        return c;
+
+    double r = c.Red(), g = c.Green(), b = c.Blue();
+    double bg;
+
+    // ialpha is 0..200 where 0 is completely black
+    // and 200 is completely white and 100 is the same
+    // convert that to normal alpha 0.0 - 1.0
+    ialpha = wxMin(ialpha, 200);
+    ialpha = wxMax(ialpha, 0);
+    double alpha = ((double)(ialpha - 100.0))/100.0;
+
+    if (ialpha > 100)
+    {
+        // blend with white
+        bg = 255.0;
+        alpha = 1.0 - alpha;  // 0 = transparent fg; 1 = opaque fg
+    }
+     else
+    {
+        // blend with black
+        bg = 0.0;
+        alpha = 1.0 + alpha;  // 0 = transparent fg; 1 = opaque fg
+    }
+
+    r = wxBlendColour(r, bg, alpha);
+    g = wxBlendColour(g, bg, alpha);
+    b = wxBlendColour(b, bg, alpha);
+
+    return wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b);
+}
+
+#define LIGHT_STEP 160
+

 // ----------------------------------------------------------------------------
 // wxSearchTextCtrl: text control used by search control
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxSearchTextCtrl: text control used by search control
 // ----------------------------------------------------------------------------


@@ -72,11 +113,45 @@ public:
                      style | wxNO_BORDER)
     {
         m_search = search;
                      style | wxNO_BORDER)
     {
         m_search = search;

-        
+        m_defaultFG = GetForegroundColour();
+

         // remove the default minsize, the searchctrl will have one instead
         SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 
         // remove the default minsize, the searchctrl will have one instead
         SetSizeHints(wxDefaultCoord,wxDefaultCoord);
     }
 

+    void SetDescriptiveText(const wxString& text)
+    {
+        if ( GetValue() == m_descriptiveText )
+        {
+            ChangeValue(wxEmptyString);
+        }
+
+        m_descriptiveText = text;
+    }
+
+    wxString GetDescriptiveText() const
+    {
+        return m_descriptiveText;
+    }
+
+
+    // provide access to the base class protected methods to wxSearchCtrl which
+    // needs to forward to them
+    void DoSetValue(const wxString& value, int flags)
+    {
+        wxTextCtrl::DoSetValue(value, flags);
+    }
+
+    bool DoLoadFile(const wxString& file, int fileType)
+    {
+        return wxTextCtrl::DoLoadFile(file, fileType);
+    }
+
+    bool DoSaveFile(const wxString& file, int fileType)
+    {
+        return wxTextCtrl::DoSaveFile(file, fileType);
+    }
+

 protected:
     void OnText(wxCommandEvent& eventText)
     {
 protected:
     void OnText(wxCommandEvent& eventText)
     {


@@ -92,7 +167,7 @@ protected:
         // copy constructor is disabled for some reason?
         //wxTextUrlEvent event(eventText);
         wxTextUrlEvent event(
         // copy constructor is disabled for some reason?
         //wxTextUrlEvent event(eventText);
         wxTextUrlEvent event(

-            m_search->GetId(), 
+            m_search->GetId(),

             eventText.GetMouseEvent(),
             eventText.GetURLStart(),
             eventText.GetURLEnd()
             eventText.GetMouseEvent(),
             eventText.GetURLStart(),
             eventText.GetURLEnd()


@@ -102,8 +177,30 @@ protected:
         m_search->GetEventHandler()->ProcessEvent(event);
     }
 
         m_search->GetEventHandler()->ProcessEvent(event);
     }
 

+    void OnIdle(wxIdleEvent& WXUNUSED(event))
+    {
+        if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
+        {
+            ChangeValue(m_descriptiveText);
+            SetInsertionPoint(0);
+            SetForegroundColour(wxStepColour(m_defaultFG, LIGHT_STEP));
+        }
+    }
+
+    void OnFocus(wxFocusEvent& event)
+    {
+        event.Skip();
+        if ( GetValue() == m_descriptiveText )
+        {
+            ChangeValue(wxEmptyString);
+            SetForegroundColour(m_defaultFG);
+        }
+    }
+

 private:
     wxSearchCtrl* m_search;
 private:
     wxSearchCtrl* m_search;

+    wxString      m_descriptiveText;
+    wxColour      m_defaultFG;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -113,6 +210,8 @@ BEGIN_EVENT_TABLE(wxSearchTextCtrl, wxTextCtrl)
     EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
     EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_ENTER(wxID_ANY, wxSearchTextCtrl::OnText)
     EVT_TEXT_URL(wxID_ANY, wxSearchTextCtrl::OnTextUrl)
     EVT_TEXT_MAXLEN(wxID_ANY, wxSearchTextCtrl::OnText)

+    EVT_IDLE(wxSearchTextCtrl::OnIdle)
+    EVT_SET_FOCUS(wxSearchTextCtrl::OnFocus)

 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------


@@ -131,27 +230,37 @@ public:
 
     void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
 
 
     void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
 

-    
+

 protected:
     wxSize DoGetBestSize() const
     {
         return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight());
     }
 protected:
     wxSize DoGetBestSize() const
     {
         return wxSize(m_bmp.GetWidth(), m_bmp.GetHeight());
     }

-    
+

     void OnLeftUp(wxMouseEvent&)
     {
         wxCommandEvent event(m_eventType, m_search->GetId());
         event.SetEventObject(m_search);
 
     void OnLeftUp(wxMouseEvent&)
     {
         wxCommandEvent event(m_eventType, m_search->GetId());
         event.SetEventObject(m_search);
 

+        if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )
+        {
+            // it's convenient to have the string to search for directly in the
+            // event instead of having to retrieve it from the control in the
+            // event handler code later, so provide it here
+            event.SetString(m_search->GetValue());
+        }
+

         GetEventHandler()->ProcessEvent(event);
 
         m_search->SetFocus();
 
         GetEventHandler()->ProcessEvent(event);
 
         m_search->SetFocus();
 

-        if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH )
+#if wxUSE_MENUS
+        if ( m_eventType == wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN )

         {
             // this happens automatically, just like on Mac OS X
             m_search->PopupSearchMenu();
         }
         {
             // this happens automatically, just like on Mac OS X
             m_search->PopupSearchMenu();
         }

+#endif // wxUSE_MENUS

     }
 
     void OnPaint(wxPaintEvent&)
     }
 
     void OnPaint(wxPaintEvent&)


@@ -160,7 +269,7 @@ protected:
         dc.DrawBitmap(m_bmp, 0,0, true);
     }
 
         dc.DrawBitmap(m_bmp, 0,0, true);
     }
 

-    
+

 private:
     wxSearchCtrl *m_search;
     wxEventType   m_eventType;
 private:
     wxSearchCtrl *m_search;
     wxEventType   m_eventType;


@@ -175,8 +284,9 @@ BEGIN_EVENT_TABLE(wxSearchButton, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)

-    EVT_SEARCHCTRL_SEARCH(wxID_ANY, wxSearchCtrl::OnSearchButton)
+    EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, wxSearchCtrl::OnSearchButton)

     EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
     EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)

+    EVT_SIZE(wxSearchCtrl::OnSize)

 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)


@@ -193,7 +303,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSearchCtrl, wxSearchCtrlBase)
 // --------
 
 wxSearchCtrl::wxSearchCtrl()
 // --------
 
 wxSearchCtrl::wxSearchCtrl()

-{ 
+{

     Init();
 }
 
     Init();
 }
 


@@ -212,17 +322,21 @@ wxSearchCtrl::wxSearchCtrl(wxWindow *parent, wxWindowID id,
 
 void wxSearchCtrl::Init()
 {
 
 void wxSearchCtrl::Init()
 {

-    m_text = 0;
-    m_searchButton = 0;
-    m_cancelButton = 0;
-    m_menu = 0;
+    m_text = NULL;
+    m_searchButton = NULL;
+    m_cancelButton = NULL;
+#if wxUSE_MENUS
+    m_menu = NULL;
+#endif // wxUSE_MENUS

 
     m_searchButtonVisible = true;
     m_cancelButtonVisible = false;
 
 
     m_searchButtonVisible = true;
     m_cancelButtonVisible = false;
 

-    m_searchMenuBitmapUser = false;

     m_searchBitmapUser = false;
     m_cancelBitmapUser = false;
     m_searchBitmapUser = false;
     m_cancelBitmapUser = false;

+#if wxUSE_MENUS
+    m_searchMenuBitmapUser = false;
+#endif // wxUSE_MENUS

 }
 
 bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,


@@ -233,17 +347,34 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
             const wxValidator& validator,
             const wxString& name)
 {

-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) )
+    // force border style for more native appearance
+    style &= ~wxBORDER_MASK;
+#ifdef __WXGTK__
+    style |= wxBORDER_SUNKEN;
+#elif defined(__WXMSW__)
+    // Don't set the style explicitly, let GetDefaultBorder() work it out, unless
+    // we will get a sunken border (e.g. on Windows 200) in which case we must
+    // override with a simple border.
+    if (GetDefaultBorder() == wxBORDER_SUNKEN)
+        style |= wxBORDER_SIMPLE;
+#else
+    style |= wxBORDER_SIMPLE;
+#endif
+    if ( !wxSearchCtrlBaseBaseClass::Create(parent, id, pos, size,
+                                            style, validator, name) )

     {
         return false;
     }
 
     m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
     {
         return false;
     }
 
     m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);

+    m_text->SetDescriptiveText(_("Search"));

 
 

-    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_BTN,
+                                        m_searchBitmap);
+    m_cancelButton = new wxSearchButton(this,
+                                        wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
+                                        m_cancelBitmap);

 
     SetForegroundColour( m_text->GetForegroundColour() );
     m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );
 
     SetForegroundColour( m_text->GetForegroundColour() );
     m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );


@@ -265,11 +396,15 @@ wxSearchCtrl::~wxSearchCtrl()
     delete m_text;
     delete m_searchButton;
     delete m_cancelButton;
     delete m_text;
     delete m_searchButton;
     delete m_cancelButton;

+#if wxUSE_MENUS

     delete m_menu;
     delete m_menu;

+#endif // wxUSE_MENUS

 }
 
 
 // search control specific interfaces
 }
 
 
 // search control specific interfaces

+#if wxUSE_MENUS
+

 void wxSearchCtrl::SetMenu( wxMenu* menu )
 {
     if ( menu == m_menu )
 void wxSearchCtrl::SetMenu( wxMenu* menu )
 {
     if ( menu == m_menu )


@@ -277,20 +412,14 @@ 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_searchButton->SetBitmapLabel(m_searchMenuBitmap);
         m_searchButton->Refresh();
     m_menu = menu;
 
     if ( m_menu && !hadMenu )
     {
         m_searchButton->SetBitmapLabel(m_searchMenuBitmap);
         m_searchButton->Refresh();

-        if ( !m_searchButtonVisible )
-        {
-            // adding the menu will force the search button to be visible
-            wxRect rect = GetRect();
-            LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
-        }

     }
     else if ( !m_menu && hadMenu )
     {
     }
     else if ( !m_menu && hadMenu )
     {


@@ -299,12 +428,9 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
         {
             m_searchButton->Refresh();
         }
         {
             m_searchButton->Refresh();
         }

-        else
-        {
-            wxRect rect = GetRect();
-            LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
-        }

     }
     }

+    wxRect rect = GetRect();
+    LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());

 }
 
 wxMenu* wxSearchCtrl::GetMenu()
 }
 
 wxMenu* wxSearchCtrl::GetMenu()


@@ -312,6 +438,8 @@ wxMenu* wxSearchCtrl::GetMenu()
     return m_menu;
 }
 
     return m_menu;
 }
 

+#endif // wxUSE_MENUS
+

 void wxSearchCtrl::ShowSearchButton( bool show )
 {
     if ( m_searchButtonVisible == show )
 void wxSearchCtrl::ShowSearchButton( bool show )
 {
     if ( m_searchButtonVisible == show )


@@ -353,6 +481,15 @@ bool wxSearchCtrl::IsCancelButtonVisible() const
     return m_cancelButtonVisible;
 }
 
     return m_cancelButtonVisible;
 }
 

+void wxSearchCtrl::SetDescriptiveText(const wxString& text)
+{
+    m_text->SetDescriptiveText(text);
+}
+
+wxString wxSearchCtrl::GetDescriptiveText() const
+{
+    return m_text->GetDescriptiveText();
+}

 
 // ----------------------------------------------------------------------------
 // geometry
 
 // ----------------------------------------------------------------------------
 // geometry


@@ -365,7 +502,7 @@ wxSize wxSearchCtrl::DoGetBestSize() const
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;

-    if ( m_searchButtonVisible || m_menu )
+    if ( m_searchButtonVisible || HasMenu() )

     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;
     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;


@@ -393,19 +530,24 @@ void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height)
 
 void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
 {
 
 void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
 {

+    if ( !m_text )
+        return;
+

     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button
     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button

-    int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
+    int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2;

     x += horizontalBorder;
     y += BORDER;
     width -= horizontalBorder*2;
     height -= BORDER*2;
     x += horizontalBorder;
     y += BORDER;
     width -= horizontalBorder*2;
     height -= BORDER*2;

+    if (width < 0) width = 0;
+    if (height < 0) height = 0;

 
     wxSize sizeSearch(0,0);
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;
 
     wxSize sizeSearch(0,0);
     wxSize sizeCancel(0,0);
     int searchMargin = 0;
     int cancelMargin = 0;

-    if ( m_searchButtonVisible || m_menu )
+    if ( m_searchButtonVisible || HasMenu() )

     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;
     {
         sizeSearch = m_searchButton->GetBestSize();
         searchMargin = MARGIN;


@@ -415,7 +557,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
         sizeCancel = m_cancelButton->GetBestSize();
         cancelMargin = MARGIN;
     }
         sizeCancel = m_cancelButton->GetBestSize();
         cancelMargin = MARGIN;
     }

-    m_searchButton->Show( m_searchButtonVisible || m_menu );
+    m_searchButton->Show( m_searchButtonVisible || HasMenu() );

     m_cancelButton->Show( m_cancelButtonVisible );
 
     if ( sizeSearch.x + sizeCancel.x > width )
     m_cancelButton->Show( m_cancelButtonVisible );
 
     if ( sizeSearch.x + sizeCancel.x > width )


@@ -425,29 +567,32 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
         searchMargin = 0;
         cancelMargin = 0;
     }
         searchMargin = 0;
         cancelMargin = 0;
     }

-    wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin;
+    wxCoord textWidth = width - sizeSearch.x - sizeCancel.x - searchMargin - cancelMargin - 1;
+    if (textWidth < 0) textWidth = 0;

 
     // position the subcontrols inside the client area
 
 
     // position the subcontrols inside the client area
 

-    m_searchButton->SetSize(x, y + ICON_OFFSET, sizeSearch.x, height);
-    m_text->SetSize(x + sizeSearch.x + searchMargin, y + ICON_OFFSET, textWidth, height);
+    m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);
+    m_text->SetSize( x + sizeSearch.x + searchMargin,
+                     y + ICON_OFFSET - BORDER,
+                     textWidth,
+                     height);

     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,

-                            y + ICON_OFFSET, sizeCancel.x, height);
+                            y + ICON_OFFSET - 1, sizeCancel.x, height);

 }
 
 
 // accessors
 // ---------
 
 }
 
 
 // accessors
 // ---------
 

-wxString wxSearchCtrl::GetValue() const
-{
-    return m_text->GetValue();
-}
-void wxSearchCtrl::SetValue(const wxString& value)
+wxString wxSearchCtrl::DoGetValue() const

 {
 {

-    m_text->SetValue(value);
+    wxString value = m_text->GetValue();
+    if (value == m_text->GetDescriptiveText())
+        return wxEmptyString;
+    else
+        return value;

 }
 }

-

 wxString wxSearchCtrl::GetRange(long from, long to) const
 {
     return m_text->GetRange(from, to);
 wxString wxSearchCtrl::GetRange(long from, long to) const
 {
     return m_text->GetRange(from, to);


@@ -669,7 +814,7 @@ long wxSearchCtrl::GetInsertionPoint() const
 {
     return m_text->GetInsertionPoint();
 }
 {
     return m_text->GetInsertionPoint();
 }

-wxTextPos wxSearchCtrl::GetLastPosition() const
+long wxSearchCtrl::GetLastPosition() const

 {
     return m_text->GetLastPosition();
 }
 {
     return m_text->GetLastPosition();
 }


@@ -693,7 +838,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;


@@ -706,7 +851,7 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
     m_searchBitmapUser = bitmap.Ok();
     if ( m_searchBitmapUser )
     {
     m_searchBitmapUser = bitmap.Ok();
     if ( m_searchBitmapUser )
     {

-        if ( m_searchButton && !m_menu )
+        if ( m_searchButton && !HasMenu() )

         {
             m_searchButton->SetBitmapLabel( m_searchBitmap );
         }
         {
             m_searchButton->SetBitmapLabel( m_searchBitmap );
         }


@@ -718,6 +863,8 @@ void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
     }
 }
 
     }
 }
 

+#if wxUSE_MENUS
+

 void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
 {
     m_searchMenuBitmap = bitmap;
 void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
 {
     m_searchMenuBitmap = bitmap;


@@ -736,6 +883,8 @@ void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
     }
 }
 
     }
 }
 

+#endif // wxUSE_MENUS
+

 void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
 {
     m_cancelBitmap = bitmap;
 void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
 {
     m_cancelBitmap = bitmap;


@@ -773,9 +922,17 @@ wxTextCtrl& operator<<(const wxChar c);
 
 void wxSearchCtrl::DoSetValue(const wxString& value, int flags)
 {
 
 void wxSearchCtrl::DoSetValue(const wxString& value, int flags)
 {

-    m_text->ChangeValue( value );
-    if ( flags & SetValue_SendEvent )
-        SendTextUpdatedEvent();
+    m_text->DoSetValue(value, flags);
+}
+
+bool wxSearchCtrl::DoLoadFile(const wxString& file, int fileType)
+{
+    return m_text->DoLoadFile(file, fileType);
+}
+
+bool wxSearchCtrl::DoSaveFile(const wxString& file, int fileType)
+{
+    return m_text->DoSaveFile(file, fileType);

 }
 
 // do the window-specific processing after processing the update event
 }
 
 // do the window-specific processing after processing the update event


@@ -810,7 +967,7 @@ static int GetMultiplier()
 wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 {
     wxColour bg = GetBackgroundColour();
 wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 {
     wxColour bg = GetBackgroundColour();

-    wxColour fg = GetForegroundColour();
+    wxColour fg = wxStepColour(GetForegroundColour(), LIGHT_STEP-20);

 
     //===============================================================================
     // begin drawing code
 
     //===============================================================================
     // begin drawing code


@@ -891,6 +1048,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
         };
         mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
     }
         };
         mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
     }

+    mem.SelectObject(wxNullBitmap);

 
     //===============================================================================
     // end drawing code
 
     //===============================================================================
     // end drawing code


@@ -902,6 +1060,11 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
         image.Rescale(x,y);
         bitmap = wxBitmap( image );
     }
         image.Rescale(x,y);
         bitmap = wxBitmap( image );
     }

+    if ( !renderDrop )
+    {
+        // Trim the edge where the arrow would have gone
+        bitmap = bitmap.GetSubBitmap(wxRect(0,0, y,y));
+    }

 
     return bitmap;
 }
 
     return bitmap;
 }


@@ -909,7 +1072,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
 wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
 {
     wxColour bg = GetBackgroundColour();
 wxBitmap wxSearchCtrl::RenderCancelBitmap( int x, int y )
 {
     wxColour bg = GetBackgroundColour();

-    wxColour fg = GetForegroundColour();
+    wxColour fg = wxStepColour(GetForegroundColour(), LIGHT_STEP);

 
     //===============================================================================
     // begin drawing code
 
     //===============================================================================
     // begin drawing code


@@ -1004,14 +1167,14 @@ void wxSearchCtrl::RecalcBitmaps()
 
     if ( !m_searchBitmapUser )
     {
 
     if ( !m_searchBitmapUser )
     {

-        if ( 
+        if (

             !m_searchBitmap.Ok() ||
             !m_searchBitmap.Ok() ||

-            m_searchBitmap.GetHeight() != bitmapHeight || 
+            m_searchBitmap.GetHeight() != bitmapHeight ||

             m_searchBitmap.GetWidth() != bitmapWidth
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);
             m_searchBitmap.GetWidth() != bitmapWidth
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);

-            if ( !m_menu )
+            if ( !HasMenu() )

             {
                 m_searchButton->SetBitmapLabel(m_searchBitmap);
             }
             {
                 m_searchButton->SetBitmapLabel(m_searchBitmap);
             }


@@ -1019,11 +1182,12 @@ void wxSearchCtrl::RecalcBitmaps()
         // else this bitmap was set by user, don't alter
     }
 
         // else this bitmap was set by user, don't alter
     }
 

+#if wxUSE_MENUS

     if ( !m_searchMenuBitmapUser )
     {
     if ( !m_searchMenuBitmapUser )
     {

-        if ( 
+        if (

             !m_searchMenuBitmap.Ok() ||
             !m_searchMenuBitmap.Ok() ||

-            m_searchMenuBitmap.GetHeight() != bitmapHeight || 
+            m_searchMenuBitmap.GetHeight() != bitmapHeight ||

             m_searchMenuBitmap.GetWidth() != bitmapWidth
             )
         {
             m_searchMenuBitmap.GetWidth() != bitmapWidth
             )
         {


@@ -1035,16 +1199,17 @@ void wxSearchCtrl::RecalcBitmaps()
         }
         // else this bitmap was set by user, don't alter
     }
         }
         // else this bitmap was set by user, don't alter
     }

+#endif // wxUSE_MENUS

 
     if ( !m_cancelBitmapUser )
     {
 
     if ( !m_cancelBitmapUser )
     {

-        if ( 
+        if (

             !m_cancelBitmap.Ok() ||
             !m_cancelBitmap.Ok() ||

-            m_cancelBitmap.GetHeight() != bitmapHeight || 
+            m_cancelBitmap.GetHeight() != bitmapHeight ||

             m_cancelBitmap.GetWidth() != bitmapHeight
             )
         {
             m_cancelBitmap.GetWidth() != bitmapHeight
             )
         {

-            m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER,bitmapHeight-BORDER); // square
+            m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER-1,bitmapHeight-BORDER-1); // square

             m_cancelButton->SetBitmapLabel(m_cancelBitmap);
         }
         // else this bitmap was set by user, don't alter
             m_cancelButton->SetBitmapLabel(m_cancelBitmap);
         }
         // else this bitmap was set by user, don't alter


@@ -1064,6 +1229,15 @@ void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )
     }
 }
 
     }
 }
 

+void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )
+{
+    int width, height;
+    GetSize(&width, &height);
+    LayoutControls(0, 0, width, height);
+}
+
+#if wxUSE_MENUS
+

 void wxSearchCtrl::PopupSearchMenu()
 {
     if ( m_menu )
 void wxSearchCtrl::PopupSearchMenu()
 {
     if ( m_menu )


@@ -1073,6 +1247,8 @@ void wxSearchCtrl::PopupSearchMenu()
     }
 }
 
     }
 }
 

+#endif // wxUSE_MENUS
+

 #endif // !wxUSE_NATIVE_SEARCH_CONTROL
 
 #endif // wxUSE_SEARCHCTRL
 #endif // !wxUSE_NATIVE_SEARCH_CONTROL
 
 #endif // wxUSE_SEARCHCTRL