X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ec3cd2d387e3df6787c334e59412d69e9eb0497..5adad46628e545a6d4172ecf3a0cb848934f5cd0:/src/mac/control.cpp diff --git a/src/mac/control.cpp b/src/mac/control.cpp index ab62f4034d..f0714b067a 100644 --- a/src/mac/control.cpp +++ b/src/mac/control.cpp @@ -13,11 +13,22 @@ #pragma implementation "control.h" #endif +#include "wx/defs.h" + #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 +72,11 @@ wxControl::wxControl() if ( wxMacLiveScrollbarActionUPP == NULL ) { +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) + wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc ); +#else wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ; +#endif } } @@ -115,11 +130,15 @@ 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 ) ; } + Refresh() ; } wxSize wxControl::DoGetBestSize() const @@ -209,13 +228,19 @@ void wxControl::MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString l 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() @@ -245,8 +270,10 @@ 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 ) ; + UMAShowControl( m_macControl ) ; } void wxControl::MacAdjustControlRect() @@ -280,6 +307,8 @@ void wxControl::MacAdjustControlRect() if ( IsKindOf( CLASSINFO( wxButton ) ) ) { m_width = m_label.Length() * 8 + 12 ; + if ( m_width < 70 ) + m_width = 70 ; } else if ( IsKindOf( CLASSINFO( wxStaticText ) ) ) { @@ -333,15 +362,15 @@ void wxControl::MacSuperChangedPosition() if ( mac_x != former_mac_x || mac_y != former_mac_y ) { - { - Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ; - InvalWindowRect( rootwindow , &inval ) ; - } + { + Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ; + InvalWindowRect( rootwindow , &inval ) ; + } UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ; - { - Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ; - InvalWindowRect( rootwindow , &inval ) ; - } + { + Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ; + InvalWindowRect( rootwindow , &inval ) ; + } } if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) ) { @@ -395,12 +424,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 ; + } } } @@ -462,15 +498,15 @@ void wxControl::DoSetSize(int x, int y, if ( mac_x != former_mac_x || mac_y != former_mac_y ) { - { - Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ; - InvalWindowRect( macrootwindow, &inval ) ; - } + { + Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ; + InvalWindowRect( macrootwindow, &inval ) ; + } UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ; - { - Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ; - InvalWindowRect(macrootwindow, &inval ) ; - } + { + Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ; + InvalWindowRect(macrootwindow, &inval ) ; + } } if ( actualX != former_x || actualY != former_y ) @@ -480,9 +516,10 @@ void wxControl::DoSetSize(int x, int y, MacRepositionScrollBars() ; // To consider -> should the parameters be the effective or the virtual coordinates (AdjustForParent..) - wxMoveEvent event(wxPoint(m_x, m_y), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + wxPoint point(m_x, m_y); + wxMoveEvent event(point, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } if ( actualWidth != former_w || actualHeight != former_h ) { @@ -500,9 +537,10 @@ void wxControl::DoSetSize(int x, int y, } MacRepositionScrollBars() ; - wxSizeEvent event(wxSize(m_width, m_height), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + wxSize size(m_width, m_height); + wxSizeEvent event(size, m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) ) { @@ -520,10 +558,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 ; } @@ -535,21 +585,10 @@ bool wxControl::Enable(bool enable) if ( m_macControl ) { - - if ( UMAHasAppearance() ) - { - if ( enable ) - ::ActivateControl( m_macControl ) ; - else - ::DeactivateControl( m_macControl ) ; - } + if ( enable ) + UMAActivateControl( m_macControl ) ; else - { - if ( enable ) - ::HiliteControl( m_macControl , 0 ) ; - else - ::HiliteControl( m_macControl , 255 ) ; - } + UMADeactivateControl( m_macControl ) ; } return TRUE ; } @@ -620,8 +659,9 @@ void wxControl::OnPaint(wxPaintEvent& event) wxMacDrawingHelper help( win ) ; // the mac control manager always assumes to have the origin at 0,0 SetOrigin( 0 , 0 ) ; + - bool hasTabBehind = false ; + bool hasTabBehind = false ; wxWindow* parent = GetParent() ; while ( parent ) { @@ -640,7 +680,7 @@ void wxControl::OnPaint(wxPaintEvent& event) parent = parent->GetParent() ; } - + UMADrawControl( m_macControl ) ; UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ; } @@ -718,10 +758,12 @@ void wxControl::OnMouseEvent( wxMouseEvent &event ) controlpart = FindControl( localwhere , window , &control ) ; { + /* if ( AcceptsFocus() && FindFocus() != this ) { SetFocus() ; } + */ if ( control && UMAIsControlActive( control ) ) { {