X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d4b632ba3c0e5e5c43412d2d7a2b485b8fcebf2..7d1f4c3ff01b09105c07d5e176a14428c834975e:/src/common/ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index be7735196d..2ebabc1f0d 100644
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -19,6 +19,7 @@
 
 #ifdef __GNUG__
     #pragma implementation "controlbase.h"
+    #pragma implementation "statbmpbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -28,27 +29,51 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_CONTROLS
+
 #ifndef WX_PRECOMP
     #include "wx/control.h"
     #include "wx/log.h"
 #endif
 
+#if wxUSE_STATBMP
+    #include "wx/bitmap.h"
+    #include "wx/statbmp.h"
+#endif // wxUSE_STATBMP
+
 // ============================================================================
 // implementation
 // ============================================================================
 
+wxControlBase::~wxControlBase()
+{
+    // this destructor is required for Darwin
+}
+
+bool wxControlBase::Create(wxWindow *parent,
+                           wxWindowID id,
+                           const wxPoint &pos,
+                           const wxSize &size,
+                           long style,
+                           const wxValidator& validator,
+                           const wxString &name)
+{
+    bool ret = wxWindow::Create(parent, id, pos, size, style, name);
+
+#if wxUSE_VALIDATORS
+    if ( ret )
+        SetValidator(validator);
+#endif // wxUSE_VALIDATORS
+
+    return ret;
+}
+
 bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   wxWindowID id,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   long style,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                                  const wxValidator* validator,
-#  else
                                   const wxValidator& validator,
-#  endif
-#endif
                                   const wxString& name)
 {
     // even if it's possible to create controls without parents in some port,
@@ -67,12 +92,66 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
 // inherit colour and font settings from the parent window
 void wxControlBase::InheritAttributes()
 {
+    // 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
+
     SetFont(GetParent()->GetFont());
 }
 
 void wxControlBase::Command(wxCommandEvent& event)
 {
-    (void)ProcessEvent(event);
+    (void)GetEventHandler()->ProcessEvent(event);
 }
+
+void wxControlBase::InitCommandEvent(wxCommandEvent& event) const
+{
+    event.SetEventObject((wxControlBase *)this);    // const_cast
+
+    // event.SetId(GetId()); -- this is usuall done in the event ctor
+
+    switch ( m_clientDataType )
+    {
+        case wxClientData_Void:
+            event.SetClientData(GetClientData());
+            break;
+
+        case wxClientData_Object:
+            event.SetClientObject(GetClientObject());
+            break;
+
+        case wxClientData_None:
+            // nothing to do
+            ;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxStaticBitmap
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STATBMP
+
+wxStaticBitmapBase::~wxStaticBitmapBase()
+{
+    // this destructor is required for Darwin
+}
+
+wxSize wxStaticBitmapBase::DoGetBestClientSize() const
+{
+    wxBitmap bmp = GetBitmap();
+    if ( bmp.Ok() )
+        return wxSize(bmp.GetWidth(), bmp.GetHeight());
+
+    // this is completely arbitrary
+    return wxSize(16, 16);
+}
+
+#endif // wxUSE_STATBMP
+
+#endif // wxUSE_CONTROLS
+