{
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 = 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);
}
{
m_search = search;
m_defaultFG = GetForegroundColour();
-
+
// remove the default minsize, the searchctrl will have one instead
SetSizeHints(wxDefaultCoord,wxDefaultCoord);
}
{
if ( GetValue() == m_descriptiveText )
{
- SetValue(wxEmptyString);
+ 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)
{
{
if ( IsEmpty() && !(wxWindow::FindFocus() == this) )
{
- SetValue(m_descriptiveText);
+ ChangeValue(m_descriptiveText);
SetInsertionPoint(0);
SetForegroundColour(wxStepColour(m_defaultFG, LIGHT_STEP));
}
event.Skip();
if ( GetValue() == m_descriptiveText )
{
- SetValue(wxEmptyString);
+ ChangeValue(wxEmptyString);
SetForegroundColour(m_defaultFG);
}
}
-
+
private:
wxSearchCtrl* m_search;
wxString m_descriptiveText;
wxColour m_defaultFG;
-
+
DECLARE_EVENT_TABLE()
};
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();
}
+#endif // wxUSE_MENUS
}
void OnPaint(wxPaintEvent&)
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_searchMenuBitmapUser = false;
m_searchBitmapUser = false;
m_cancelBitmapUser = false;
+#if wxUSE_MENUS
+ m_searchMenuBitmapUser = false;
+#endif // wxUSE_MENUS
}
bool wxSearchCtrl::Create(wxWindow *parent, wxWindowID id,
const wxValidator& validator,
const wxString& name)
{
+ // force border style for more native appearance
+ style &= ~wxBORDER_MASK;
#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
- if ( !wxTextCtrlBase::Create(parent, id, pos, size, wxSIMPLE_BORDER | style, validator, name) )
+ 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);
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() );
delete m_text;
delete m_searchButton;
delete m_cancelButton;
+#if wxUSE_MENUS
delete m_menu;
+#endif // wxUSE_MENUS
}
// search control specific interfaces
+#if wxUSE_MENUS
+
void wxSearchCtrl::SetMenu( wxMenu* menu )
{
if ( menu == m_menu )
}
}
wxRect rect = GetRect();
- LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
+ LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
}
wxMenu* wxSearchCtrl::GetMenu()
return m_menu;
}
+#endif // wxUSE_MENUS
+
void wxSearchCtrl::ShowSearchButton( bool show )
{
if ( m_searchButtonVisible == show )
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;
{
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 sizeCancel(0,0);
int searchMargin = 0;
int cancelMargin = 0;
- if ( m_searchButtonVisible || m_menu )
+ if ( m_searchButtonVisible || HasMenu() )
{
sizeSearch = m_searchButton->GetBestSize();
searchMargin = 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 )
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
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,
- textWidth,
+ textWidth,
height);
m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
y + ICON_OFFSET - 1, sizeCancel.x, height);
m_searchBitmapUser = bitmap.Ok();
if ( m_searchBitmapUser )
{
- if ( m_searchButton && !m_menu )
+ if ( m_searchButton && !HasMenu() )
{
m_searchButton->SetBitmapLabel( m_searchBitmap );
}
}
}
+#if wxUSE_MENUS
+
void wxSearchCtrl::SetSearchMenuBitmap( const wxBitmap& bitmap )
{
m_searchMenuBitmap = bitmap;
}
}
+#endif // wxUSE_MENUS
+
void wxSearchCtrl::SetCancelBitmap( const wxBitmap& bitmap )
{
m_cancelBitmap = bitmap;
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
mem.DrawPolygon(WXSIZEOF(dropPolygon),dropPolygon,multiplier*triangleX,multiplier*triangleY);
}
mem.SelectObject(wxNullBitmap);
-
+
//===============================================================================
// end drawing code
//===============================================================================
)
{
m_searchBitmap = RenderSearchBitmap(bitmapWidth,bitmapHeight,false);
- if ( !m_menu )
+ if ( !HasMenu() )
{
m_searchButton->SetBitmapLabel(m_searchBitmap);
}
// else this bitmap was set by user, don't alter
}
+#if wxUSE_MENUS
if ( !m_searchMenuBitmapUser )
{
if (
}
// else this bitmap was set by user, don't alter
}
+#endif // wxUSE_MENUS
if ( !m_cancelBitmapUser )
{
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
LayoutControls(0, 0, width, height);
}
+#if wxUSE_MENUS
+
void wxSearchCtrl::PopupSearchMenu()
{
if ( m_menu )
}
}
+#endif // wxUSE_MENUS
+
#endif // !wxUSE_NATIVE_SEARCH_CONTROL
#endif // wxUSE_SEARCHCTRL
projects / wxWidgets.git / blobdiff