updated wxExecute checks in wxGTK to be same as in other Unix ports after recent...

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 6b834f3abaa67ab15bf378d3827ad125a30f0027..83f789b8243ff5180ca36e507d0827f207262db7 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxControl common interface
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$
 // Purpose:     wxControl common interface
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.07.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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 char wxControlNameStr[] = "control";

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


@@ -55,7 +52,7 @@ bool wxControlBase::Create(wxWindow *parent,
                            const wxPoint &pos,
                            const wxSize &size,
                            long style,
                            const wxPoint &pos,
                            const wxSize &size,
                            long style,

-                           const wxValidator& validator,
+                           const wxValidator& wxVALIDATOR_PARAM(validator),

                            const wxString &name)
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);
                            const wxString &name)
 {
     bool ret = wxWindow::Create(parent, id, pos, size, style, name);


@@ -79,35 +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;

 }
 
 }
 

-// inherit colour and font settings from the parent window
-void wxControlBase::InheritAttributes()
+/* static */
+wxString wxControlBase::GetLabelText(const wxString& label)

 {
 {

-    // it definitely doesn't make sense to inherit the background colour as the
-    // controls typically have their own standard one and probably not the
-    // foreground neither?
-#if 0
-    SetBackgroundColour(GetParent()->GetBackgroundColour());
-    SetForegroundColour(GetParent()->GetForegroundColour());
-#endif // 0
-
-#ifdef __WXPM__
-    //
-    // All OS/2 ctrls use the small font
-    //
-    SetFont(*wxSMALL_FONT);
-#else
-    SetFont(GetParent()->GetFont());
-#endif
+    // 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)


@@ -137,6 +120,50 @@ void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
     }
 }
 
     }
 }
 

+bool wxControlBase::SetFont(const wxFont& font)
+{
+    InvalidateBestSize();
+    return wxWindow::SetFont(font);
+}
+
+// wxControl-specific processing after processing the update event
+void wxControlBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    // 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);
+}
+
+wxBorder wxControlBase::GetDefaultBorder() const
+{
+    return wxBORDER_THEME;
+}
+
+

 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxStaticBitmap
 // ----------------------------------------------------------------------------


@@ -148,17 +175,19 @@ wxStaticBitmapBase::~wxStaticBitmapBase()
     // this destructor is required for Darwin
 }
 
     // this destructor is required for Darwin
 }
 

-wxSize wxStaticBitmapBase::DoGetBestClientSize() 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

-