Patch # 984209 - Calls to wxFind() were using an old signature. They now check for...

[wxWidgets.git] / src / mac / carbon / spinctrl.cpp

diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp
index 2a57f1e0b97e4486d600fd37252c1ecec15a7be6..b006866a06f5865a9a52f755ae994ae248d66c5e 100644 (file)
--- a/src/mac/carbon/spinctrl.cpp
+++ b/src/mac/carbon/spinctrl.cpp
@@ -5,7 +5,7 @@
 // Modified by: Mark Newsam (Based on GTK file)
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling
 // Modified by: Mark Newsam (Based on GTK file)
 // RCS-ID:      $Id$
 // Copyright:   (c) Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -196,6 +196,9 @@ wxSpinCtrl::~wxSpinCtrl()
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {
 
 wxSize wxSpinCtrl::DoGetBestSize() const
 {

+    if (!m_btn || !m_text)
+        return GetSize();
+    

     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();
 
     wxSize sizeBtn = m_btn->GetBestSize(),
            sizeText = m_text->GetBestSize();