Fixing inactive state drawing, and removing warning.

[wxWidgets.git] / src / mac / classic / control.cpp

diff --git a/src/mac/classic/control.cpp b/src/mac/classic/control.cpp
index 07c5a659324733245344976bc37630b5523ac0c7..d5c0ca1880fdea89878f4a4552cf71d6d4a06b6e 100644 (file)
--- a/src/mac/classic/control.cpp
+++ b/src/mac/classic/control.cpp
@@ -24,16 +24,16 @@
     #include "wx/dcclient.h"
     #include "wx/button.h"
     #include "wx/dialog.h"
     #include "wx/dcclient.h"
     #include "wx/button.h"
     #include "wx/dialog.h"

+    #include "wx/scrolbar.h"
+    #include "wx/stattext.h"
+    #include "wx/statbox.h"
+    #include "wx/radiobox.h"
+    #include "wx/sizer.h"

 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #endif // WX_PRECOMP
 
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"

-#include "wx/radiobox.h"

 #include "wx/spinbutt.h"
 #include "wx/spinbutt.h"

-#include "wx/scrolbar.h"
-#include "wx/statbox.h"
-#include "wx/sizer.h"
-#include "wx/stattext.h"

 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 


@@ -190,11 +190,11 @@ wxControl::~wxControl()
     wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
     wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.

-    wxWindow *parent = GetParent() ;
-    if ( parent )
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( tlw )

     {
     {

-        if (parent->GetDefaultItem() == (wxButton*) this)
-            parent->SetDefaultItem(NULL);
+        if ( tlw->GetDefaultItem() == (wxButton*) this)
+            tlw->SetDefaultItem(NULL);

     }
     if ( (ControlHandle) m_macControl )
     {
     }
     if ( (ControlHandle) m_macControl )
     {


@@ -207,7 +207,7 @@ wxControl::~wxControl()
 
 void wxControl::SetLabel(const wxString& title)
 {
 
 void wxControl::SetLabel(const wxString& title)
 {

-    m_label = wxStripMenuCodes(title) ;
+    m_label = GetLabelText(title) ;

 
     if ( m_macControl )
     {
 
     if ( m_macControl )
     {


@@ -309,7 +309,7 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
     ((Rect*)outBounds)->bottom = 0;
     ((Rect*)outBounds)->right = 0;
 
     ((Rect*)outBounds)->bottom = 0;
     ((Rect*)outBounds)->right = 0;
 

-    wxMacStringToPascal( wxStripMenuCodes(label) , maclabel ) ;
+    wxMacStringToPascal( GetLabelText(label) , maclabel ) ;

 }
 
 void wxControl::MacPostControlCreate()
 }
 
 void wxControl::MacPostControlCreate()


@@ -398,7 +398,7 @@ void wxControl::MacPostControlCreate()
     SetSize(pos.x, pos.y, new_size.x, new_size.y);
 
 #if wxUSE_UNICODE
     SetSize(pos.x, pos.y, new_size.x, new_size.y);
 
 #if wxUSE_UNICODE

-    UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) , m_font.GetEncoding() ) ;
+    UMASetControlTitle( (ControlHandle) m_macControl , GetLabelText(m_label) , m_font.GetEncoding() ) ;

 #endif
 
     if ( m_macControlIsShown )
 #endif
 
     if ( m_macControlIsShown )