Misc small mods

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

diff --git a/src/mac/control.cpp b/src/mac/control.cpp
index 161d1b71b19d575af43efb753e0e506d861d1563..63610676a06912f12de959f129bd651bd5ebeceb 100644 (file)
--- a/src/mac/control.cpp
+++ b/src/mac/control.cpp
@@ -14,10 +14,19 @@
 #endif
 
 #include "wx/control.h"
+#include "wx/panel.h"
+#include "wx/app.h"
+#include "wx/dc.h"
 #include "wx/notebook.h"
 #include "wx/tabctrl.h"
 #include "wx/radiobox.h"
 #include "wx/spinbutt.h"
+#include "wx/scrolbar.h"
+#include "wx/button.h"
+#include "wx/dialog.h"
+#include "wx/statbox.h"
+#include "wx/sizer.h"
+#include "wx/stattext.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
@@ -61,7 +70,11 @@ wxControl::wxControl()
 
        if ( wxMacLiveScrollbarActionUPP == NULL )
        {
+#ifdef __UNIX__
+        wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
+#else
                wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
+#endif
        }
 }
 
@@ -115,9 +128,12 @@ void wxControl::SetLabel(const wxString& title)
                else
                        label = title ;
                
-               strcpy( (char*) maclabel , label ) ;
-               c2pstr( (char*) maclabel ) ;
-       
+#if TARGET_CARBON
+               c2pstrcpy( (StringPtr) maclabel , label ) ;
+#else
+               strcpy( (char *) maclabel , label ) ;
+               c2pstr( (char *) maclabel ) ;
+#endif
                ::SetControlTitle( m_macControl , maclabel ) ;
        }
 }
@@ -203,22 +219,25 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l
        m_y = y ;
                
 
-       Point localOrigin ;
-       Rect    clipRect ;
-       
        parent->MacClientToRootWindow( &x , &y ) ;
        outBounds->top = y + m_macVerticalBorder ;
        outBounds->left = x + m_macHorizontalBorder ;
        outBounds->bottom = outBounds->top + m_height - 2 * m_macVerticalBorder;
        outBounds->right = outBounds->left + m_width - 2 * m_macHorizontalBorder ;
 
-       strcpy( (char*) maclabel , label ) ;
+       char c_text[255];
+       strcpy( c_text , label ) ;
        if( wxApp::s_macDefaultEncodingIsPC )
        {
-               wxMacConvertFromPCForControls( (char*) maclabel ) ;
+               wxMacConvertFromPCForControls( c_text ) ;
        }
 
-       c2pstr( (char*) maclabel ) ;
+#if TARGET_CARBON
+       c2pstrcpy( (StringPtr) maclabel , c_text ) ;
+#else
+       strcpy( (char *) maclabel , c_text ) ;
+       c2pstr( (char *) maclabel ) ;
+#endif
 }
 
 void wxControl::MacPostControlCreate()
@@ -248,6 +267,7 @@ void wxControl::MacPostControlCreate()
        ControlHandle container = GetParent()->MacGetContainerForEmbedding() ;
        wxASSERT_MSG( container != NULL , "No valid mac container control" ) ;
        ::UMAEmbedControl( m_macControl , container ) ;
+       m_macControlIsShown  = true ;
        MacAdjustControlRect() ;
        wxAssociateControlWithMacControl( m_macControl , this ) ;
 }
@@ -398,12 +418,19 @@ void  wxControl::MacSuperShown( bool show )
        {
                if ( !show )
                {
-                       ::UMAHideControl( m_macControl ) ;
+                       if ( m_macControlIsShown )
+                       {
+                               ::UMAHideControl( m_macControl ) ;
+                               m_macControlIsShown = false ;
+                       }
                }
                else
                {
-                       if ( m_isShown )
+                       if ( MacIsReallyShown() && !m_macControlIsShown )
+                       {
                                ::UMAShowControl( m_macControl ) ;
+                               m_macControlIsShown = true ;
+                       }
                }
        }
                
@@ -523,10 +550,22 @@ bool  wxControl::Show(bool show)
                
        if ( m_macControl )
        {
-               if ( show )
-                       ::UMAShowControl( m_macControl ) ;
+               if ( !show )
+               {
+                       if ( m_macControlIsShown )
+                       {
+                               ::UMAHideControl( m_macControl ) ;
+                               m_macControlIsShown = false ;
+                       }
+               }
                else
-                       ::UMAHideControl( m_macControl ) ;
+               {
+                       if ( MacIsReallyShown() && !m_macControlIsShown )
+                       {
+                               ::UMAShowControl( m_macControl ) ;
+                               m_macControlIsShown = true ;
+                       }
+               }
        }
        return TRUE ;
 }
@@ -605,6 +644,7 @@ void wxControl::MacRedrawControl()
                                
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+                               wxDC::MacInvalidateSetup() ;
                        }
                }
        }
@@ -646,6 +686,7 @@ void wxControl::OnPaint(wxPaintEvent& event)
                                
                                UMADrawControl( m_macControl ) ;
                                UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+                               wxDC::MacInvalidateSetup() ;
                        }
                }
        }
@@ -721,10 +762,12 @@ void  wxControl::OnMouseEvent( wxMouseEvent &event )
        
                controlpart = FindControl( localwhere , window , &control ) ;
                {
+               /*
                        if ( AcceptsFocus() && FindFocus() != this )
                        {
                                SetFocus() ;
                        }
+               */
                        if ( control && UMAIsControlActive( control ) )
                        {
                                {