Border corrections

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

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index 8ddd276753410c66641859919787852df0a6196d..49b469f03310bc7e7d9262a887b928ce4e4f0265 100644 (file)
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -50,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
 // ----------------------------------------------------------------------------


@@ -62,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,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()
 };


@@ -103,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()
 
 // ----------------------------------------------------------------------------


@@ -137,11 +246,13 @@ protected:
 
         m_search->SetFocus();
 
 
         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&)


@@ -203,17 +314,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,


@@ -224,21 +339,34 @@ 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;
     }
 
     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_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() );


@@ -260,11 +388,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 )


@@ -280,12 +412,6 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
     {
         m_searchButton->SetBitmapLabel(m_searchMenuBitmap);
         m_searchButton->Refresh();
     {
         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 )
     {


@@ -294,12 +420,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()


@@ -307,6 +430,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 )


@@ -348,6 +473,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


@@ -360,7 +494,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;


@@ -390,10 +524,10 @@ 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
     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;
     x += horizontalBorder;
     y += BORDER;
     width -= horizontalBorder*2;


@@ -403,7 +537,7 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     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;


@@ -413,7 +547,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 )


@@ -423,17 +557,17 @@ 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;

 
     // 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, 
+    m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);
+    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,
                      height);
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,

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

 }
 
 
 }
 
 


@@ -442,7 +576,11 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
 
 wxString wxSearchCtrl::GetValue() const
 {
 
 wxString wxSearchCtrl::GetValue() const
 {

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

 }
 void wxSearchCtrl::SetValue(const wxString& value)
 {
 }
 void wxSearchCtrl::SetValue(const wxString& value)
 {


@@ -707,7 +845,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 );
         }


@@ -719,6 +857,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;


@@ -737,6 +877,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;


@@ -774,9 +916,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


@@ -811,7 +961,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


@@ -892,6 +1042,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


@@ -903,6 +1054,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;
 }


@@ -910,7 +1066,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


@@ -1012,7 +1168,7 @@ void wxSearchCtrl::RecalcBitmaps()
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);
             )
         {
             m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);

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

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


@@ -1020,6 +1176,7 @@ 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 (


@@ -1036,6 +1193,7 @@ 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 )
     {


@@ -1045,7 +1203,7 @@ void wxSearchCtrl::RecalcBitmaps()
             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


@@ -1065,13 +1223,15 @@ void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )
     }
 }
 
     }
 }
 

-void wxSearchCtrl::OnSize( wxSizeEvent& event )
+void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )

 {
     int width, height;
     GetSize(&width, &height);
     LayoutControls(0, 0, width, height);
 }
 
 {
     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 )


@@ -1081,6 +1241,8 @@ void wxSearchCtrl::PopupSearchMenu()
     }
 }
 
     }
 }
 

+#endif // wxUSE_MENUS
+

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