Visualage C++ V4.0 duplicate symbol fixes

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 122f58de8fa498838c6f41516602acf40d99785e..f6fa56cb91b0ef5859aa363bb0c6d858e35bdf95 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -18,7 +18,7 @@
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
 
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
 

-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxControlBase)
+IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)

 
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)
        EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
 
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)
        EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 


@@ -383,7 +383,6 @@ void wxControl::MacSuperEnabled( bool enabled )
 
 void  wxControl::MacSuperShown( bool show ) 
 {
 
 void  wxControl::MacSuperShown( bool show ) 
 {

-       /*

        if ( m_macControl )
        {
                if ( !show )
        if ( m_macControl )
        {
                if ( !show )


@@ -392,13 +391,12 @@ void  wxControl::MacSuperShown( bool show )
                }
                else
                {
                }
                else
                {

-                       if ( m_macShown )
+                       if ( m_isShown )

                                ::UMAShowControl( m_macControl ) ;
                }
        }
                
        wxWindow::MacSuperShown( show ) ;
                                ::UMAShowControl( m_macControl ) ;
                }
        }
                
        wxWindow::MacSuperShown( show ) ;

-       */

 }
 
 void  wxControl::DoSetSize(int x, int y,
 }
 
 void  wxControl::DoSetSize(int x, int y,