projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added dependency handling to Makefiles
[wxWidgets.git]
/
src
/
mac
/
carbon
/
button.cpp
diff --git
a/src/mac/carbon/button.cpp
b/src/mac/carbon/button.cpp
index c67c470acfbe1ce05e35e4712f441df06949b063..363789a94521f979fce8ee9dfeba079f9c44fee1 100644
(file)
--- a/
src/mac/carbon/button.cpp
+++ b/
src/mac/carbon/button.cpp
@@
-13,6
+13,8
@@
#pragma implementation "button.h"
#endif
#pragma implementation "button.h"
#endif
+#include "wx/defs.h"
+
#include "wx/button.h"
#include "wx/panel.h"
#include "wx/button.h"
#include "wx/panel.h"
@@
-35,7
+37,7
@@
bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
MacPreControlCreate( parent , id , label , pos , size ,style, validator , name , &bounds , title ) ;
- m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title ,
tru
e , 0 , 0 , 1,
+ m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title ,
fals
e , 0 , 0 , 1,
kControlPushButtonProc , (long) this ) ;
wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
kControlPushButtonProc , (long) this ) ;
wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
@@
-55,7
+57,7
@@
void wxButton::SetDefault()
panel->SetDefaultItem(this);
}
panel->SetDefaultItem(this);
}
-#ifdef __
UNIX
__
+#ifdef __
DARWIN
__
Boolean inData;
if ( btnOldDefault && btnOldDefault->m_macControl )
{
Boolean inData;
if ( btnOldDefault && btnOldDefault->m_macControl )
{