projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxHeaderCtrl::OnColumnCountChanging()
[wxWidgets.git]
/
include
/
wx
/
generic
/
srchctlg.h
diff --git
a/include/wx/generic/srchctlg.h
b/include/wx/generic/srchctlg.h
index 84daadaa38cad42118b4cef15658de6310206433..407783f957169e767d636b019d36f29c63cf7af3 100644
(file)
--- a/
include/wx/generic/srchctlg.h
+++ b/
include/wx/generic/srchctlg.h
@@
-15,14
+15,14
@@
#include "wx/bitmap.h"
#include "wx/bitmap.h"
-class WXDLL
EXPORT
wxSearchButton;
-class WXDLL
EXPORT
wxSearchTextCtrl;
+class WXDLL
IMPEXP_FWD_CORE
wxSearchButton;
+class WXDLL
IMPEXP_FWD_CORE
wxSearchTextCtrl;
// ----------------------------------------------------------------------------
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxSearchCtrl : public wxSearchCtrlBase
+class WXDLL
IMPEXP_CORE
wxSearchCtrl : public wxSearchCtrlBase
{
public:
// creation
{
public:
// creation
@@
-47,10
+47,12
@@
public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSearchCtrlNameStr);
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxSearchCtrlNameStr);
+#if wxUSE_MENUS
// get/set search button menu
// --------------------------
virtual void SetMenu( wxMenu* menu );
virtual wxMenu* GetMenu();
// get/set search button menu
// --------------------------
virtual void SetMenu( wxMenu* menu );
virtual wxMenu* GetMenu();
+#endif // wxUSE_MENUS
// get/set search options
// ----------------------
// get/set search options
// ----------------------
@@
-60,6
+62,10
@@
public:
virtual void ShowCancelButton( bool show );
virtual bool IsCancelButtonVisible() const;
virtual void ShowCancelButton( bool show );
virtual bool IsCancelButtonVisible() const;
+ // TODO: In 2.9 these should probably be virtual, and declared in the base class...
+ void SetDescriptiveText(const wxString& text);
+ wxString GetDescriptiveText() const;
+
// accessors
// ---------
// accessors
// ---------
@@
-191,11
+197,15
@@
public:
// search control generic only
void SetSearchBitmap( const wxBitmap& bitmap );
// search control generic only
void SetSearchBitmap( const wxBitmap& bitmap );
- void SetSearchMenuBitmap( const wxBitmap& bitmap );
void SetCancelBitmap( const wxBitmap& bitmap );
void SetCancelBitmap( const wxBitmap& bitmap );
+#if wxUSE_MENUS
+ void SetSearchMenuBitmap( const wxBitmap& bitmap );
+#endif // wxUSE_MENUS
protected:
protected:
- virtual void DoSetValue(const wxString& value, int flags = 0);
+ virtual void DoSetValue(const wxString& value, int flags);
+ virtual bool DoLoadFile(const wxString& file, int fileType);
+ virtual bool DoSaveFile(const wxString& file, int fileType);
// override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestSize() const;
// override the base class virtuals involved into geometry calculations
virtual wxSize DoGetBestSize() const;
@@
-212,27
+222,47
@@
protected:
virtual void OnSearchButton( wxCommandEvent& event );
void OnSetFocus( wxFocusEvent& event );
virtual void OnSearchButton( wxCommandEvent& event );
void OnSetFocus( wxFocusEvent& event );
+ void OnSize( wxSizeEvent& event );
+
+ bool HasMenu() const
+ {
+#if wxUSE_MENUS
+ return m_menu != NULL;
+#else // !wxUSE_MENUS
+ return false;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
+ }
private:
friend class wxSearchButton;
private:
friend class wxSearchButton;
+#if wxUSE_MENUS
void PopupSearchMenu();
void PopupSearchMenu();
+#endif // wxUSE_MENUS
// the subcontrols
wxSearchTextCtrl *m_text;
wxSearchButton *m_searchButton;
wxSearchButton *m_cancelButton;
// the subcontrols
wxSearchTextCtrl *m_text;
wxSearchButton *m_searchButton;
wxSearchButton *m_cancelButton;
+#if wxUSE_MENUS
wxMenu *m_menu;
wxMenu *m_menu;
+#endif // wxUSE_MENUS
bool m_searchButtonVisible;
bool m_cancelButtonVisible;
bool m_searchBitmapUser;
bool m_searchButtonVisible;
bool m_cancelButtonVisible;
bool m_searchBitmapUser;
- bool m_searchMenuBitmapUser;
bool m_cancelBitmapUser;
bool m_cancelBitmapUser;
+#if wxUSE_MENUS
+ bool m_searchMenuBitmapUser;
+#endif // wxUSE_MENUS
+
wxBitmap m_searchBitmap;
wxBitmap m_searchBitmap;
- wxBitmap m_searchMenuBitmap;
wxBitmap m_cancelBitmap;
wxBitmap m_cancelBitmap;
+#if wxUSE_MENUS
+ wxBitmap m_searchMenuBitmap;
+#endif // wxUSE_MENUS
+
private:
DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
private:
DECLARE_DYNAMIC_CLASS(wxSearchCtrl)