projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for GTK assertion from gtk_widget_set_colormap, bug 1882040
[wxWidgets.git]
/
src
/
common
/
ctrlcmn.cpp
diff --git
a/src/common/ctrlcmn.cpp
b/src/common/ctrlcmn.cpp
index a0af638bcb9ef6b34c3f023882f36a6c6d9f286d..83f789b8243ff5180ca36e507d0827f207262db7 100644
(file)
--- a/
src/common/ctrlcmn.cpp
+++ b/
src/common/ctrlcmn.cpp
@@
-31,14
+31,12
@@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/radiobut.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/radiobut.h"
-#endif
-
-#if wxUSE_STATBMP
- #include "wx/bitmap.h"
#include "wx/statbmp.h"
#include "wx/statbmp.h"
-#endif // wxUSE_STATBMP
+ #include "wx/bitmap.h"
+ #include "wx/utils.h" // for wxStripMenuCodes()
+#endif
-
WXDLLIMPEXP_DATA_CORE(const wxChar) wxControlNameStr[] = wxT("control")
;
+
const char wxControlNameStr[] = "control"
;
// ============================================================================
// implementation
// ============================================================================
// implementation
@@
-88,6
+86,13
@@
bool wxControlBase::CreateControl(wxWindowBase *parent,
return true;
}
return true;
}
+/* static */
+wxString wxControlBase::GetLabelText(const wxString& label)
+{
+ // we don't want strip the TABs here, just the mnemonics
+ return wxStripMenuCodes(label, wxStrip_Mnemonics);
+}
+
void wxControlBase::Command(wxCommandEvent& event)
{
(void)GetEventHandler()->ProcessEvent(event);
void wxControlBase::Command(wxCommandEvent& event)
{
(void)GetEventHandler()->ProcessEvent(event);
@@
-115,13
+120,6
@@
void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
}
}
}
}
-
-void wxControlBase::SetLabel( const wxString &label )
-{
- InvalidateBestSize();
- wxWindow::SetLabel(label);
-}
-
bool wxControlBase::SetFont(const wxFont& font)
{
InvalidateBestSize();
bool wxControlBase::SetFont(const wxFont& font)
{
InvalidateBestSize();
@@
-154,6
+152,18
@@
void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
#endif // wxUSE_RADIOBTN
}
#endif // wxUSE_RADIOBTN
}
+/* static */
+wxString wxControlBase::RemoveMnemonics(const wxString& str)
+{
+ return wxStripMenuCodes(str, wxStrip_Mnemonics);
+}
+
+wxBorder wxControlBase::GetDefaultBorder() const
+{
+ return wxBORDER_THEME;
+}
+
+
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------