#include "wx/control.h"
#include "wx/notebook.h"
#include "wx/tabctrl.h"
+#include "wx/radiobox.h"
#include "wx/spinbutt.h"
#if !USE_SHARED_LIBRARY
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;
- m_callback = 0;
+#if WXWIN_COMPATIBILITY
+ m_callback = 0;
+#endif // WXWIN_COMPATIBILITY
if ( wxMacLiveScrollbarActionUPP == NULL )
{
}
}
+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;
// If we delete an item, we should initialize the parent panel,
// because it could now be invalid.
- wxWindow *parent = (wxWindow *)GetParent();
- if (parent)
+ wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
+ if ( panel )
{
- if (parent->GetDefaultItem() == (wxButton*) this)
- parent->SetDefaultItem(NULL);
+ if (panel->GetDefaultItem() == (wxButton*) this)
+ panel->SetDefaultItem(NULL);
}
if ( m_macControl )
{
}
}
-void wxControl::SetLabel(const wxString& label)
+void wxControl::SetLabel(const wxString& title)
{
- m_label = label ;
+ m_label = title ;
if ( m_macControl )
{
Str255 maclabel ;
+ wxString label ;
+
+ if( wxApp::s_macDefaultEncodingIsPC )
+ label = wxMacMakeMacStringFromPC( title ) ;
+ else
+ label = title ;
strcpy( (char*) maclabel , label ) ;
c2pstr( (char*) maclabel ) ;
}
}
-wxString wxControl::GetLabel() const
+wxSize wxControl::DoGetBestSize() const
{
- return m_label ;
+ return wxSize(20, 20);
}
-void wxControl::ProcessCommand (wxCommandEvent & event)
+bool wxControl::ProcessCommand (wxCommandEvent & event)
{
// Tries:
// 1) A callback function (to become obsolete)
// 2) OnCommand, starting at this window and working up parent hierarchy
// 3) OnCommand then calls ProcessEvent to search the event tables.
- if (m_callback)
+#if WXWIN_COMPATIBILITY
+ if ( m_callback )
{
- (void) (*(m_callback)) (*this, event);
+ (void)(*m_callback)(this, event);
+
+ return TRUE;
}
else
+#endif // WXWIN_COMPATIBILITY
{
- GetEventHandler()->OnCommand(*this, event);
+ return GetEventHandler()->ProcessEvent(event);
}
}
-void wxControl::Centre (int direction)
-{
- int x, y, width, height, panel_width, panel_height, new_x, new_y;
-
- wxWindow *parent = (wxWindow *) GetParent ();
- if (!parent)
- return;
-
- parent->GetClientSize (&panel_width, &panel_height);
- GetSize (&width, &height);
- GetPosition (&x, &y);
-
- new_x = x;
- new_y = y;
-
- if (direction & wxHORIZONTAL)
- new_x = (int) ((panel_width - width) / 2);
-
- if (direction & wxVERTICAL)
- new_y = (int) ((panel_height - height) / 2);
-
- SetSize (new_x, new_y, width, height);
-}
-
-void wxControl::SetClientSize (int width, int height)
-{
- SetSize (-1, -1, width, height);
-}
-
// ------------------------
wxList *wxWinMacControlList = NULL;
wxControl *wxFindControlFromMacControl(ControlHandle inControl )
{
// no font
}
- else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) )
+ else if ( IsKindOf( CLASSINFO( wxStaticBox ) ) || IsKindOf( CLASSINFO( wxRadioBox ) ) || IsKindOf( CLASSINFO( wxButton ) ) )
{
ControlFontStyleRec controlstyle ;
controlstyle.flags = kControlUseFontMask ;
{
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 ) ) )
void wxControl::MacSuperEnabled( bool enabled )
{
+/*
if ( m_macControl )
{
if ( UMAHasAppearance() )
}
}
wxWindow::MacSuperEnabled( enabled ) ;
+*/
}
void wxControl::MacSuperShown( bool show )
}
else
{
- if ( m_macShown )
+ if ( m_isShown )
::UMAShowControl( m_macControl ) ;
}
}
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() ;
}
}
-void wxControl::DoSetClientSize(int width, int height)
-{
- DoSetSize( -1 , -1 , width , height ) ;
-}
-
bool wxControl::Show(bool show)
{
- if ( m_macControl == NULL )
- return wxWindow::Show( show ) ;
-
- if ( m_macShown == show )
- return TRUE ;
-
- if ( show )
- ::UMAShowControl( m_macControl ) ;
- else
- ::UMAHideControl( m_macControl ) ;
-
- return wxWindow::Show( show ) ;
+ if ( !wxWindow::Show( show ) )
+ return FALSE ;
+
+ if ( m_macControl )
+ {
+ if ( show )
+ ::UMAShowControl( m_macControl ) ;
+ else
+ ::UMAHideControl( m_macControl ) ;
+ }
+ return TRUE ;
}
-void wxControl::Enable(bool enable)
+bool wxControl::Enable(bool enable)
{
- if ( m_macControl == NULL )
- return wxWindow::Enable( enable ) ;
-
- if ( m_macEnabled == enable )
- return ;
+ if ( !wxWindow::Enable(enable) )
+ return FALSE;
- if ( UMAHasAppearance() )
- {
- if ( enable )
- ::ActivateControl( m_macControl ) ;
- else
- ::DeactivateControl( m_macControl ) ;
- }
- else
+ if ( m_macControl )
{
- if ( enable )
- ::HiliteControl( m_macControl , 0 ) ;
+
+ if ( UMAHasAppearance() )
+ {
+ if ( enable )
+ ::ActivateControl( m_macControl ) ;
+ else
+ ::DeactivateControl( m_macControl ) ;
+ }
else
- ::HiliteControl( m_macControl , 255 ) ;
+ {
+ if ( enable )
+ ::HiliteControl( m_macControl , 0 ) ;
+ else
+ ::HiliteControl( m_macControl , 255 ) ;
+ }
}
-
- return wxWindow::Enable( enable ) ;
+ return TRUE ;
}
void wxControl::Refresh(bool eraseBack, const wxRect *rect)
}
}
+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 ) ;
+ }
+ }
+ }
+}
+
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 ;
wxWindow* parent = GetParent() ;
while ( parent )
{
- if( parent->m_macWindowData )
+ if( parent->MacGetWindowData() )
{
- UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
+ UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , kThemeBrushDialogBackgroundActive , false ) ;
break ;
}
}
UMADrawControl( m_macControl ) ;
- UMASetThemeWindowBackground( win->m_macWindowData->m_macWindow , win->m_macWindowData->m_macWindowBackgroundTheme , false ) ;
+ UMASetThemeWindowBackground( win->MacGetWindowData()->m_macWindow , win->MacGetWindowData()->m_macWindowBackgroundTheme , false ) ;
}
}
}
else
{
- wxWindow::OnPaint( event ) ;
+ // wxWindow::OnPaint( event ) ;
}
}
+void wxControl::OnEraseBackground(wxEraseEvent& event)
+{
+ // In general, you don't want to erase the background of a control,
+ // or you'll get a flicker.
+ // TODO: move this 'null' function into each control that
+ // might flicker.
+}
+
void wxControl::OnKeyDown( wxKeyEvent &event )
{
return ;
}
- if (event.GetEventType() == wxEVT_LEFT_DOWN )
+ if (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK )
{
int x = event.m_x ;
projects / wxWidgets.git / blobdiff