#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)
ControlActionUPP wxMacLiveScrollbarActionUPP = NULL ;
+pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode ) ;
pascal void wxMacLiveScrollbarActionProc( ControlHandle control , ControlPartCode partCode )
{
if ( partCode != 0)
wxControl::wxControl()
{
- m_macControl = NULL ;
- m_macHorizontalBorder = 0 ; // additional pixels around the real control
- m_macVerticalBorder = 0 ;
+ m_macControl = NULL ;
+ m_macHorizontalBorder = 0 ; // additional pixels around the real control
+ m_macVerticalBorder = 0 ;
m_backgroundColour = *wxWHITE;
m_foregroundColour = *wxBLACK;
#if WXWIN_COMPATIBILITY
if ( wxMacLiveScrollbarActionUPP == NULL )
{
+#ifdef __UNIX__
+ wxMacLiveScrollbarActionUPP = NewControlActionUPP( wxMacLiveScrollbarActionProc );
+#else
wxMacLiveScrollbarActionUPP = NewControlActionProc( wxMacLiveScrollbarActionProc ) ;
+#endif
}
}
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size, long style,
+ const wxValidator& validator,
+ const wxString& name)
+{
+ m_macControl = NULL ;
+ m_macHorizontalBorder = 0 ; // additional pixels around the real control
+ m_macVerticalBorder = 0 ;
+ bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+ if (rval) {
+#if wxUSE_VALIDATORS
+ SetValidator(validator);
+#endif
+ }
+ return rval;
+}
+
wxControl::~wxControl()
{
m_isBeingDeleted = TRUE;
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 ) ;
}
}
-wxSize wxControl::DoGetBestSize()
+wxSize wxControl::DoGetBestSize() const
{
return wxSize(20, 20);
}
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()
{
// no font
}
- else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
+ else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )
{
ControlFontStyleRec controlstyle ;
controlstyle.flags = kControlUseFontMask ;
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 ) ;
}
{
if ( IsKindOf( CLASSINFO( wxButton ) ) )
{
- m_width = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
+ m_width = m_label.Length() * 8 + 12 ;
}
else if ( IsKindOf( CLASSINFO( wxStaticText ) ) )
{
m_width = m_label.Length() * 8 ;
}
else
- m_width = bestsize.right - bestsize.left + 2 * m_macHorizontalBorder;
+ m_width = bestsize.right - bestsize.left ;
+
+ m_width += 2 * m_macHorizontalBorder ;
}
if ( m_height == -1 )
{
wxMacDrawingHelper helper ( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
if ( helper.Ok() )
{
- UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
+ UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
}
}
}
{
if ( m_macControl )
{
- int former_mac_x = (**m_macControl).contrlRect.left ;
- int former_mac_y = (**m_macControl).contrlRect.top ;
+ Rect contrlRect ;
+ GetControlBounds( m_macControl , &contrlRect ) ;
+ int former_mac_x = contrlRect.left ;
+ int former_mac_y = contrlRect.top ;
int mac_x = m_x ;
int mac_y = m_y ;
GetParent()->MacClientToRootWindow( & mac_x , & mac_y ) ;
{
{
Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
- InvalRect( &inval ) ;
+ InvalWindowRect( rootwindow , &inval ) ;
}
- UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
+ 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 } ;
- InvalRect( &inval ) ;
+ InvalWindowRect( rootwindow , &inval ) ;
}
}
if ( wxrootwindow->IsKindOf( CLASSINFO( wxDialog ) ) )
}
}
wxWindow::MacSuperEnabled( enabled ) ;
- */
+*/
}
void wxControl::MacSuperShown( bool show )
{
- /*
if ( m_macControl )
{
if ( !show )
{
- ::UMAHideControl( m_macControl ) ;
+ if ( m_macControlIsShown )
+ {
+ ::UMAHideControl( m_macControl ) ;
+ m_macControlIsShown = false ;
+ }
}
else
{
- if ( m_macShown )
+ if ( MacIsReallyShown() && !m_macControlIsShown )
+ {
::UMAShowControl( m_macControl ) ;
+ m_macControlIsShown = true ;
+ }
}
}
wxWindow::MacSuperShown( show ) ;
- */
}
void wxControl::DoSetSize(int x, int y,
int former_w = m_width ;
int former_h = m_height ;
- int former_mac_x = (**m_macControl).contrlRect.left ;
- int former_mac_y = (**m_macControl).contrlRect.top ;
+ Rect contrlRect ;
+ GetControlBounds( m_macControl , &contrlRect ) ;
+ int former_mac_x = contrlRect.left ;
+ int former_mac_y = contrlRect.top ;
int currentX, currentY;
GetPosition(¤tX, ¤tY);
int actualHeight = height;
int actualX = x;
int actualY = y;
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
actualX = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+ if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
actualY = currentY;
if (width == -1)
actualWidth = currentW ;
return ;
AdjustForParentClientOrigin(actualX, actualY, sizeFlags);
- wxMacDrawingHelper focus( wxFindWinFromMacWindow( GetMacRootWindow() ) ) ;
+ WindowRef macrootwindow = GetMacRootWindow() ;
+ wxMacDrawingHelper focus( wxFindWinFromMacWindow( macrootwindow ) ) ;
int mac_x = actualX ;
int mac_y = actualY ;
{
{
Rect inval = { former_mac_y , former_mac_x , former_mac_y + m_height , former_mac_x + m_width } ;
- InvalRect( &inval ) ;
+ InvalWindowRect( macrootwindow, &inval ) ;
}
- UMAMoveControl( m_macControl , mac_x + m_macHorizontalBorder , mac_y + m_macVerticalBorder ) ;
+ 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 } ;
- InvalRect( &inval ) ;
+ InvalWindowRect(macrootwindow, &inval ) ;
}
}
{
{
Rect inval = { mac_y , mac_x , mac_y + former_h , mac_x + former_w } ;
- InvalRect( &inval ) ;
+ InvalWindowRect( macrootwindow, &inval ) ;
}
m_width = actualWidth ;
m_height = actualHeight ;
- UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
+ UMASizeControl( m_macControl , m_width - 2 * m_macHorizontalBorder, m_height - 2 * m_macVerticalBorder ) ;
{
Rect inval = { mac_y , mac_x , mac_y + m_height , mac_x + m_width } ;
- InvalRect( &inval ) ;
+ InvalWindowRect( macrootwindow , &inval ) ;
}
MacRepositionScrollBars() ;
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 ;
}
}
}
+void wxControl::MacRedrawControl()
+{
+ if ( m_macControl )
+ {
+ WindowRef window = GetMacRootWindow() ;
+ if ( window )
+ {
+ wxWindow* win = wxFindWinFromMacWindow( window ) ;
+ if ( win )
+ {
+ wxMacDrawingHelper help( win ) ;
+ // the mac control manager always assumes to have the origin at 0,0
+ SetOrigin( 0 , 0 ) ;
+
+ bool hasTabBehind = false ;
+ wxWindow* parent = GetParent() ;
+ while ( parent )
+ {
+ if( parent->MacGetWindowData() )
+ {
+ UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+ break ;
+ }
+
+ if( parent->IsKindOf( CLASSINFO( wxNotebook ) ) || parent->IsKindOf( CLASSINFO( wxTabCtrl ) ))
+ {
+ if ( ((wxControl*)parent)->m_macControl )
+ SetUpControlBackground( ((wxControl*)parent)->m_macControl , -1 , true ) ;
+ break ;
+ }
+
+ parent = parent->GetParent() ;
+ }
+
+ UMADrawControl( m_macControl ) ;
+ UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+ wxDC::MacInvalidateSetup() ;
+ }
+ }
+ }
+}
+
void wxControl::OnPaint(wxPaintEvent& event)
{
if ( m_macControl )
if ( win )
{
wxMacDrawingHelper help( win ) ;
+ // the mac control manager always assumes to have the origin at 0,0
SetOrigin( 0 , 0 ) ;
bool hasTabBehind = false ;
UMADrawControl( m_macControl ) ;
UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
+ wxDC::MacInvalidateSetup() ;
}
}
}
return ;
}
- if (event.GetEventType() == wxEVT_LEFT_DOWN )
+ if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
{
int x = event.m_x ;
controlpart = FindControl( localwhere , window , &control ) ;
{
+ /*
if ( AcceptsFocus() && FindFocus() != this )
{
SetFocus() ;
}
+ */
if ( control && UMAIsControlActive( control ) )
{
{
projects / wxWidgets.git / blobdiff