a tad bit more padding

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index eab0f889f12ae35443944932851c14336ae00c77..2bb9ab4520052522d7c1afc91d185da90d507412 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:


@@ -17,11 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "controlbase.h"
-    #pragma implementation "statbmpbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,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


@@ -68,13 +65,6 @@ bool wxControlBase::Create(wxWindow *parent,
     return ret;
 }
 
     return ret;
 }
 

-
-void wxControlBase::Init()
-{
-    m_adjustMinSize = true;
-}
-
-

 bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   wxWindowID id,
                                   const wxPoint& pos,
 bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   wxWindowID id,
                                   const wxPoint& pos,


@@ -86,14 +76,21 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
     // even if it's possible to create controls without parents in some port,
     // it should surely be discouraged because it doesn't work at all under
     // Windows
     // even if it's possible to create controls without parents in some port,
     // it should surely be discouraged because it doesn't work at all under
     // Windows

-    wxCHECK_MSG( parent, FALSE, wxT("all controls must have parents") );
+    wxCHECK_MSG( parent, false, wxT("all controls must have parents") );

 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

 
     parent->AddChild(this);
 
 
     parent->AddChild(this);
 

-    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 wxControlBase::Command(wxCommandEvent& event)


@@ -123,22 +120,43 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
     }
 }
 
     }
 }
 

-void wxControlBase::SetLabel(const wxString& label)
+
+void wxControlBase::SetLabel( const wxString &label )

 {
 {

+    InvalidateBestSize();

     wxWindow::SetLabel(label);
     wxWindow::SetLabel(label);

-    if (GetAdjustMinSizeFlag())
-        SetBestSize(wxDefaultSize);

 }
 
 }
 

-

 bool wxControlBase::SetFont(const wxFont& font)
 {
 bool wxControlBase::SetFont(const wxFont& font)
 {

-    bool ret = wxWindow::SetFont(font);
+    InvalidateBestSize();
+    return wxWindow::SetFont(font);
+}

 
 

-    if (GetAdjustMinSizeFlag())
-        SetBestSize(wxDefaultSize);
+// wxControl-specific processing after processing the update event
+void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    // call inherited
+    wxWindowBase::DoUpdateWindowUI(event);

 
 

-    return ret;
+    // 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

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


@@ -154,15 +172,17 @@ wxStaticBitmapBase::~wxStaticBitmapBase()
 
 wxSize wxStaticBitmapBase::DoGetBestSize() const
 {
 
 wxSize wxStaticBitmapBase::DoGetBestSize() const
 {

+    wxSize best;

     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )
     wxBitmap bmp = GetBitmap();
     if ( bmp.Ok() )

-        return wxSize(bmp.GetWidth(), bmp.GetHeight());
-
-    // this is completely arbitrary
-    return wxSize(16, 16);
+        best = wxSize(bmp.GetWidth(), bmp.GetHeight());
+    else
+        // this is completely arbitrary
+        best = wxSize(16, 16);
+    CacheBestSize(best);
+    return best;

 }
 
 #endif // wxUSE_STATBMP
 
 #endif // wxUSE_CONTROLS
 }
 
 #endif // wxUSE_STATBMP
 
 #endif // wxUSE_CONTROLS

-