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_defaultFG = GetForegroundColour();
- // remove the default minsize, the searchctrl will have one instead
- SetSizeHints(wxDefaultCoord,wxDefaultCoord);
- }
-
- void SetDescriptiveText(const wxString& text)
- {
- if ( GetValue() == m_descriptiveText )
- {
- ChangeValue(wxEmptyString);
- }
+ SetHint(_("Search"));
- m_descriptiveText = text;
+ // Ensure that our best size is recomputed using our overridden
+ // DoGetBestSize().
+ InvalidateBestSize();
}
- wxString GetDescriptiveText() const
+ virtual wxWindow* GetMainWindowOfCompositeControl()
{
- return m_descriptiveText;
+ return m_search;
}
-
// provide access to the base class protected methods to wxSearchCtrl which
// needs to forward to them
void DoSetValue(const wxString& value, int flags)
m_search->GetEventHandler()->ProcessEvent(event);
}
- void OnIdle(wxIdleEvent& WXUNUSED(event))
+#ifdef __WXMSW__
+ // We increase the text control height to be the same as for the controls
+ // with border as this is what we actually need here because even though
+ // this control itself is borderless, it's inside wxSearchCtrl which does
+ // have the border and so should have the same height as the normal text
+ // entries with border.
+ //
+ // This is a bit ugly and it would arguably be better to use whatever size
+ // the base class version returns and just centre the text vertically in
+ // the search control but I failed to modify the code in LayoutControls()
+ // to do this easily and as there is much in that code I don't understand
+ // (notably what is the logic for buttons sizing?) I prefer to not touch it
+ // at all.
+ virtual wxSize DoGetBestSize() const
{
- if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
- {
- ChangeValue(m_descriptiveText);
- SetInsertionPoint(0);
- SetForegroundColour(m_defaultFG.ChangeLightness (LIGHT_STEP));
- }
- }
+ const long flags = GetWindowStyleFlag();
+ wxSearchTextCtrl* const self = const_cast<wxSearchTextCtrl*>(this);
- void OnFocus(wxFocusEvent& event)
- {
- event.Skip();
- if ( GetValue() == m_descriptiveText )
- {
- ChangeValue(wxEmptyString);
- SetForegroundColour(m_defaultFG);
- }
+ self->SetWindowStyleFlag((flags & ~wxBORDER_MASK) | wxBORDER_DEFAULT);
+ const wxSize size = wxTextCtrl::DoGetBestSize();
+ self->SetWindowStyleFlag(flags);
+
+ return size;
}
+#endif // __WXMSW__
private:
wxSearchCtrl* m_search;
- wxString m_descriptiveText;
- wxColour m_defaultFG;
DECLARE_EVENT_TABLE()
};
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()
// ----------------------------------------------------------------------------
m_bmp(bmp)
{ }
- void SetBitmapLabel(const wxBitmap& label) { m_bmp = label; }
+ void SetBitmapLabel(const wxBitmap& label)
+ {
+ m_bmp = label;
+ InvalidateBestSize();
+ }
+ // 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; }
+
+ virtual wxWindow* GetMainWindowOfCompositeControl()
+ {
+ return m_search;
+ }
protected:
wxSize DoGetBestSize() const
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxSearchCtrl, wxSearchCtrlBase)
- EVT_SEARCHCTRL_SEARCH_BTN(wxID_ANY, wxSearchCtrl::OnSearchButton)
+ EVT_SEARCHCTRL_CANCEL_BTN(wxID_ANY, wxSearchCtrl::OnCancelButton)
EVT_SET_FOCUS(wxSearchCtrl::OnSetFocus)
EVT_SIZE(wxSearchCtrl::OnSize)
END_EVENT_TABLE()
return false;
}
- m_text = new wxSearchTextCtrl(this, value, style & ~wxBORDER_MASK);
- m_text->SetDescriptiveText(_("Search"));
+ m_text = new wxSearchTextCtrl(this, value, style);
m_searchButton = new wxSearchButton(this,
wxEVT_COMMAND_SEARCHCTRL_SEARCH_BTN,
wxEVT_COMMAND_SEARCHCTRL_CANCEL_BTN,
m_cancelBitmap);
- SetForegroundColour( m_text->GetForegroundColour() );
- m_searchButton->SetForegroundColour( m_text->GetForegroundColour() );
- m_cancelButton->SetForegroundColour( m_text->GetForegroundColour() );
-
SetBackgroundColour( m_text->GetBackgroundColour() );
- m_searchButton->SetBackgroundColour( m_text->GetBackgroundColour() );
- m_cancelButton->SetBackgroundColour( m_text->GetBackgroundColour() );
RecalcBitmaps();
void wxSearchCtrl::SetDescriptiveText(const wxString& text)
{
- m_text->SetDescriptiveText(text);
+ m_text->SetHint(text);
}
wxString wxSearchCtrl::GetDescriptiveText() const
{
- return m_text->GetDescriptiveText();
+ return m_text->GetHint();
}
// ----------------------------------------------------------------------------
y + ICON_OFFSET - 1, sizeCancel.x, height);
}
+wxWindowList wxSearchCtrl::GetCompositeWindowParts() const
+{
+ wxWindowList parts;
+ parts.push_back(m_text);
+ parts.push_back(m_searchButton);
+ parts.push_back(m_cancelButton);
+ return parts;
+}
// accessors
// ---------
wxString wxSearchCtrl::DoGetValue() const
{
- wxString value = m_text->GetValue();
- if (value == m_text->GetDescriptiveText())
- return wxEmptyString;
- else
- return value;
+ return m_text->GetValue();
}
wxString wxSearchCtrl::GetRange(long from, long to) const
{
bool wxSearchCtrl::SetFont(const wxFont& font)
{
- bool result = wxSearchCtrlBase::SetFont(font);
- if ( result && m_text )
- {
- result = m_text->SetFont(font);
- }
+ if ( !wxSearchCtrlBase::SetFont(font) )
+ return false;
+
+ // Recreate the bitmaps as their size may have changed.
+ RecalcBitmaps();
+
+ return true;
+}
+
+bool wxSearchCtrl::SetBackgroundColour(const wxColour& colour)
+{
+ if ( !wxSearchCtrlBase::SetBackgroundColour(colour) )
+ return false;
+
+ // When the background changes, re-render the bitmaps so that the correct
+ // colour shows in their "transparent" area.
RecalcBitmaps();
- return result;
+
+ return true;
}
// search control generic only
}
}
-void wxSearchCtrl::OnSearchButton( wxCommandEvent& event )
+void wxSearchCtrl::OnCancelButton( wxCommandEvent& event )
{
+ m_text->Clear();
event.Skip();
}
projects / wxWidgets.git / blobdiff