Fix typo in last commit

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

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index b40557a72458fcbb1aed01a1e99be63a7a8ebfbb..d0efcd17b308f97a2ed004eed13b3192be5900c0 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -5,7 +5,7 @@
 // Created:     2006-02-19
 // RCS-ID:      $Id$
 // Copyright:   Vince Harron
 // Created:     2006-02-19
 // RCS-ID:      $Id$
 // Copyright:   Vince Harron

-// License:     wxWindows licence
+// Licence:     wxWindows licence

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


@@ -50,55 +50,6 @@ 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
 
 // ----------------------------------------------------------------------------
 #define LIGHT_STEP 160
 
 // ----------------------------------------------------------------------------


@@ -110,30 +61,34 @@ class wxSearchTextCtrl : public wxTextCtrl
 public:
     wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style)
         : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
 public:
     wxSearchTextCtrl(wxSearchCtrl *search, const wxString& value, int style)
         : wxTextCtrl(search, wxID_ANY, value, wxDefaultPosition, wxDefaultSize,

-                     style | wxNO_BORDER)
+                     (style & ~wxBORDER_MASK) | wxNO_BORDER)

     {
         m_search = search;
     {
         m_search = search;

-        m_defaultFG = GetForegroundColour();
-        
+
+        SetHint(_("Search"));
+

         // 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)
+
+    // provide access to the base class protected methods to wxSearchCtrl which
+    // needs to forward to them
+    void DoSetValue(const wxString& value, int flags)

     {
     {

-        if ( GetValue() == m_descriptiveText )
-        {
-            SetValue(wxEmptyString);
-        }
-        
-        m_descriptiveText = text;
+        wxTextCtrl::DoSetValue(value, flags);

     }
     }

-    
-    wxString GetDescriptiveText() const
+
+    bool DoLoadFile(const wxString& file, int fileType)

     {
     {

-        return m_descriptiveText;
+        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)
     {


@@ -159,31 +114,9 @@ protected:
         m_search->GetEventHandler()->ProcessEvent(event);
     }
 
         m_search->GetEventHandler()->ProcessEvent(event);
     }
 

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

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

-    wxString      m_descriptiveText;
-    wxColour      m_defaultFG;
-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -192,8 +125,6 @@ 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()
 
 // ----------------------------------------------------------------------------


@@ -212,6 +143,13 @@ public:
 
     void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
 
 
     void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
 

+    // The buttons in wxSearchCtrl shouldn't accept focus from keyboard because
+    // this would interfere with the usual TAB processing: the user expects
+    // that pressing TAB in the search control should switch focus to the next
+    // control and not give it to the button inside the same control. Besides,
+    // the search button can be already activated by pressing "Enter" so there
+    // is really no reason for it to be able to get focus from keyboard.
+    virtual bool AcceptsFocusFromKeyboard() const { return false; }

 
 protected:
     wxSize DoGetBestSize() const
 
 protected:
     wxSize DoGetBestSize() const


@@ -224,15 +162,25 @@ protected:
         wxCommandEvent event(m_eventType, m_search->GetId());
         event.SetEventObject(m_search);
 
         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 wxUSE_MENUS

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

+#endif // wxUSE_MENUS

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


@@ -294,17 +242,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,


@@ -315,22 +267,33 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
             const wxValidator& validator,
             const wxString& name)
 {

+    // force border style for more native appearance
+    style &= ~wxBORDER_MASK;

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSUNKEN_BORDER | style, validator, name) )
+    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
 #else

-    if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) )
+    style |= wxBORDER_SIMPLE;

 #endif
 #endif

+    if ( !wxSearchCtrlBaseBaseClass::Create(parent, id, pos, size,
+                                            style, validator, name) )

     {
         return false;
     }
 
     {
         return false;
     }
 

-    m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
-    m_text->SetDescriptiveText(_("Search"));
-    
-    wxSize sizeText = m_text->GetBestSize();
+    m_text = new wxSearchTextCtrl(this, value, style);

 
 

-    m_searchButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,m_searchBitmap);
-    m_cancelButton = new wxSearchButton(this,wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,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() );


@@ -352,11 +315,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 )


@@ -382,7 +349,7 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
         }
     }
     wxRect rect = GetRect();
         }
     }
     wxRect rect = GetRect();

-    LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());    
+    LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());

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


@@ -390,6 +357,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 )


@@ -433,12 +402,12 @@ bool wxSearchCtrl::IsCancelButtonVisible() const
 
 void wxSearchCtrl::SetDescriptiveText(const wxString& text)
 {
 
 void wxSearchCtrl::SetDescriptiveText(const wxString& text)
 {

-    m_text->SetDescriptiveText(text);
+    m_text->SetHint(text);

 }
 
 wxString wxSearchCtrl::GetDescriptiveText() const
 {
 }
 
 wxString wxSearchCtrl::GetDescriptiveText() const
 {

-    return m_text->GetDescriptiveText();
+    return m_text->GetHint();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -452,7 +421,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;


@@ -482,7 +451,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
 {
     if ( !m_text )
         return;
 {
     if ( !m_text )
         return;

-    
+

     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button
     int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
     wxSize sizeText = m_text->GetBestSize();
     // make room for the search menu & clear button
     int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2;


@@ -490,12 +459,14 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     y += BORDER;
     width -= horizontalBorder*2;
     height -= BORDER*2;
     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;


@@ -505,7 +476,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 )


@@ -515,14 +486,15 @@ 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
 
     m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);
 
     // position the subcontrols inside the client area
 
     m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);

-    m_text->SetSize( x + sizeSearch.x + searchMargin, 
+    m_text->SetSize( x + sizeSearch.x + searchMargin,

                      y + ICON_OFFSET - BORDER,
                      y + ICON_OFFSET - BORDER,

-                     textWidth, 
+                     textWidth,

                      height);
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
                             y + ICON_OFFSET - 1, sizeCancel.x, height);
                      height);
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
                             y + ICON_OFFSET - 1, sizeCancel.x, height);


@@ -532,15 +504,10 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
 // accessors
 // ---------
 
 // accessors
 // ---------
 

-wxString wxSearchCtrl::GetValue() const
+wxString wxSearchCtrl::DoGetValue() const

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

-void wxSearchCtrl::SetValue(const wxString& value)
-{
-    m_text->SetValue(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);


@@ -762,7 +729,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();
 }


@@ -796,10 +763,10 @@ bool wxSearchCtrl::SetFont(const wxFont& font)
 void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
 {
     m_searchBitmap = bitmap;
 void wxSearchCtrl::SetSearchBitmap( const wxBitmap& bitmap )
 {
     m_searchBitmap = bitmap;

-    m_searchBitmapUser = bitmap.Ok();
+    m_searchBitmapUser = bitmap.IsOk();

     if ( m_searchBitmapUser )
     {
     if ( m_searchBitmapUser )
     {

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

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


@@ -811,10 +778,12 @@ 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;

-    m_searchMenuBitmapUser = bitmap.Ok();
+    m_searchMenuBitmapUser = bitmap.IsOk();

     if ( m_searchMenuBitmapUser )
     {
         if ( m_searchButton && m_menu )
     if ( m_searchMenuBitmapUser )
     {
         if ( m_searchButton && m_menu )


@@ -829,10 +798,12 @@ 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;

-    m_cancelBitmapUser = bitmap.Ok();
+    m_cancelBitmapUser = bitmap.IsOk();

     if ( m_cancelBitmapUser )
     {
         if ( m_cancelButton )
     if ( m_cancelBitmapUser )
     {
         if ( m_cancelButton )


@@ -866,9 +837,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


@@ -903,7 +882,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 = wxStepColour(GetForegroundColour(), LIGHT_STEP-20);
+    wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP-20);

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


@@ -985,7 +964,7 @@ wxBitmap wxSearchCtrl::RenderSearchBitmap( int x, int y, bool renderDrop )
         mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
     }
     mem.SelectObject(wxNullBitmap);
         mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
     }
     mem.SelectObject(wxNullBitmap);

-    
+

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


@@ -1008,7 +987,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 = wxStepColour(GetForegroundColour(), LIGHT_STEP);
+    wxColour fg = GetForegroundColour().ChangeLightness(LIGHT_STEP);

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


@@ -1104,13 +1083,13 @@ void wxSearchCtrl::RecalcBitmaps()
     if ( !m_searchBitmapUser )
     {
         if (
     if ( !m_searchBitmapUser )
     {
         if (

-            !m_searchBitmap.Ok() ||
+            !m_searchBitmap.IsOk() ||

             m_searchBitmap.GetHeight() != bitmapHeight ||
             m_searchBitmap.GetWidth() != bitmapWidth
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);
             m_searchBitmap.GetHeight() != bitmapHeight ||
             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);
             }


@@ -1118,10 +1097,11 @@ 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 (
     if ( !m_searchMenuBitmapUser )
     {
         if (

-            !m_searchMenuBitmap.Ok() ||
+            !m_searchMenuBitmap.IsOk() ||

             m_searchMenuBitmap.GetHeight() != bitmapHeight ||
             m_searchMenuBitmap.GetWidth() != bitmapWidth
             )
             m_searchMenuBitmap.GetHeight() != bitmapHeight ||
             m_searchMenuBitmap.GetWidth() != bitmapWidth
             )


@@ -1134,16 +1114,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 (
 
     if ( !m_cancelBitmapUser )
     {
         if (

-            !m_cancelBitmap.Ok() ||
+            !m_cancelBitmap.IsOk() ||

             m_cancelBitmap.GetHeight() != bitmapHeight ||
             m_cancelBitmap.GetWidth() != bitmapHeight
             )
         {
             m_cancelBitmap.GetHeight() != 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


@@ -1170,6 +1151,8 @@ void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )
     LayoutControls(0, 0, width, height);
 }
 
     LayoutControls(0, 0, width, height);
 }
 

+#if wxUSE_MENUS
+

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


@@ -1179,6 +1162,8 @@ void wxSearchCtrl::PopupSearchMenu()
     }
 }
 
     }
 }
 

+#endif // wxUSE_MENUS
+

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