From: Robert Roebling <robert@roebling.de>
Date: Tue, 12 Dec 2006 22:27:01 +0000 (+0000)
Subject:   Made wxSearchCtrl look like other text controls under GTK+.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/10eeb875ec24cc5da8802a9ab63ea2b6f6dabe6c

  Made wxSearchCtrl look like other text controls under GTK+.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp
index e8059422e6..8ddd276753 100644
--- a/src/generic/srchctlg.cpp
+++ b/src/generic/srchctlg.cpp
@@ -224,7 +224,11 @@ bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name)
 {
+#ifdef __WXGTK__
+    if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSUNKEN_BORDER | style, validator, name) )
+#else
     if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) )
+#endif
     {
         return false;
     }
@@ -424,7 +428,10 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
     // 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_text->SetSize( x + sizeSearch.x + searchMargin, 
+                     y + ICON_OFFSET - BORDER,
+                     textWidth, 
+                     height);
     m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
                             y + ICON_OFFSET, sizeCancel.x, height);
 }