Rework the wxCusor ctor taking wx stock number to provide as many cursors as

[wxWidgets.git] / src / common / ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index ece152edaa8a3a7330432c06b8fd4871e3bbe1ff..1a026c4e394453fc0d477fa4a80ea719154005cf 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        ctrlcmn.cpp
+// Name:        src/common/ctrlcmn.cpp

 // Purpose:     wxControl common interface
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxControl common interface
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -26,15 +26,17 @@
 
 #if wxUSE_CONTROLS
 
 
 #if wxUSE_CONTROLS
 

+#include "wx/control.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/control.h"

     #include "wx/log.h"
     #include "wx/log.h"

+    #include "wx/radiobut.h"
+    #include "wx/statbmp.h"
+    #include "wx/bitmap.h"
+    #include "wx/utils.h"       // for wxStripMenuCodes()

 #endif
 
 #endif
 

-#if wxUSE_STATBMP
-    #include "wx/bitmap.h"
-    #include "wx/statbmp.h"
-#endif // wxUSE_STATBMP
+const wxChar wxControlNameStr[] = wxT("control");

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -84,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);


@@ -111,17 +120,42 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
     }
 }
 
     }
 }
 

-
-void wxControlBase::SetLabel( const wxString &label )
+bool wxControlBase::SetFont(const wxFont& font)

 {
     InvalidateBestSize();
 {
     InvalidateBestSize();

-    wxWindow::SetLabel(label);
+    return wxWindow::SetFont(font);

 }
 
 }
 

-bool wxControlBase::SetFont(const wxFont& font)
+// wxControl-specific processing after processing the update event
+void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)

 {
 {

-    InvalidateBestSize();
-    return wxWindow::SetFont(font);
+    // call inherited
+    wxWindowBase::DoUpdateWindowUI(event);
+
+    // update label
+    if ( event.GetSetText() )
+    {
+        if ( event.GetText() != GetLabel() )
+            SetLabel(event.GetText());
+    }
+
+    // Unfortunately we don't yet have common base class for
+    // wxRadioButton, so we handle updates of radiobuttons here.
+    // TODO: If once wxRadioButtonBase will exist, move this code there.
+#if wxUSE_RADIOBTN
+    if ( event.GetSetChecked() )
+    {
+        wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
+        if ( radiobtn )
+            radiobtn->SetValue(event.GetChecked());
+    }
+#endif // wxUSE_RADIOBTN
+}
+
+/* static */
+wxString wxControlBase::RemoveMnemonics(const wxString& str)
+{
+    return wxStripMenuCodes(str, wxStrip_Mnemonics);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -151,4 +185,3 @@ wxSize wxStaticBitmapBase::DoGetBestSize() const
 #endif // wxUSE_STATBMP
 
 #endif // wxUSE_CONTROLS
 #endif // wxUSE_STATBMP
 
 #endif // wxUSE_CONTROLS

-