From c1fb8167e9d3bb0d62749d58fe6c9a5afc1bd3e3 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 6 Aug 2001 15:57:14 +0000 Subject: [PATCH] corrected mac src due to new api changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/image/makemac6.mcp | Bin 0 -> 204247 bytes src/mac/app.cpp | 1 + src/mac/button.cpp | 3 ++- src/mac/carbon/app.cpp | 1 + src/mac/carbon/button.cpp | 3 ++- src/mac/carbon/textctrl.cpp | 15 +++++++++------ src/mac/carbon/window.cpp | 24 +++++++----------------- src/mac/textctrl.cpp | 15 +++++++++------ src/mac/window.cpp | 24 +++++++----------------- src/makemac6.mcp | Bin 647231 -> 647231 bytes 10 files changed, 38 insertions(+), 48 deletions(-) create mode 100644 samples/image/makemac6.mcp diff --git a/samples/image/makemac6.mcp b/samples/image/makemac6.mcp new file mode 100644 index 0000000000000000000000000000000000000000..84afd5e9c31a949944f657a671fee0bb924cb9fa GIT binary patch literal 204247 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 RnB(>u=L&k2Z-D0s{|_9%-m3rr literal 0 HcmV?d00001 diff --git a/src/mac/app.cpp b/src/mac/app.cpp index 8ad21ed778..efd6012932 100644 --- a/src/mac/app.cpp +++ b/src/mac/app.cpp @@ -138,6 +138,7 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , unsigne OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply) { + SysBeep(40) ; ProcessSerialNumber PSN ; PSN.highLongOfPSN = 0 ; PSN.lowLongOfPSN = kCurrentProcess ; diff --git a/src/mac/button.cpp b/src/mac/button.cpp index 363789a945..e8a9b079b6 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -53,7 +53,8 @@ void wxButton::SetDefault() wxPanel *panel = wxDynamicCast(parent, wxPanel); if ( panel ) { - btnOldDefault = panel->GetDefaultItem(); + btnOldDefault = wxDynamicCast(panel->GetDefaultItem(), + wxButton); panel->SetDefaultItem(this); } diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp index 8ad21ed778..efd6012932 100644 --- a/src/mac/carbon/app.cpp +++ b/src/mac/carbon/app.cpp @@ -138,6 +138,7 @@ pascal OSErr AEHandleQuit( const AppleEvent *event , AppleEvent *reply , unsigne OSErr wxApp::MacHandleAEODoc(const AppleEvent *event , AppleEvent *reply) { + SysBeep(40) ; ProcessSerialNumber PSN ; PSN.highLongOfPSN = 0 ; PSN.lowLongOfPSN = kCurrentProcess ; diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 363789a945..e8a9b079b6 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -53,7 +53,8 @@ void wxButton::SetDefault() wxPanel *panel = wxDynamicCast(parent, wxPanel); if ( panel ) { - btnOldDefault = panel->GetDefaultItem(); + btnOldDefault = wxDynamicCast(panel->GetDefaultItem(), + wxButton); panel->SetDefaultItem(this); } diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 69da2912c7..f522366b32 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -680,12 +680,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) } if ( panel && panel->GetDefaultItem() ) { - wxButton *def = panel->GetDefaultItem() ; - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); - event.Skip() ; - return ; + wxButton *def = wxDynamicCast(panel->GetDefaultItem(), + wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + return ; + } } } //else: multiline controls need Enter for themselves diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp index 32f583f2ec..3f12059d91 100644 --- a/src/mac/carbon/window.cpp +++ b/src/mac/carbon/window.cpp @@ -264,11 +264,9 @@ void wxWindowMac::SetFocus() } #endif // wxUSE_CARET // panel wants to track the window which was the last to have focus in it - wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); - if ( panel ) - { - panel->SetLastFocus((wxWindow*)this); - } + wxChildFocusEvent eventFocus(this); + (void)GetEventHandler()->ProcessEvent(eventFocus); + #ifndef __WXUNIVERSAL__ wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) @@ -1482,18 +1480,10 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) // notice that it's also important to do it upwards the tree becaus // otherwise when the top level panel gets focus, it won't set it back to // us, but to some other sibling - wxWindowMac *win = this; - while ( win ) - { - wxWindowMac *parent = win->GetParent(); - wxPanel *panel = wxDynamicCast(parent, wxPanel); - if ( panel ) - { - panel->SetLastFocus(win); - } - - win = parent; - } + + // CS:don't know if this is still needed: + //wxChildFocusEvent eventFocus(this); + //(void)GetEventHandler()->ProcessEvent(eventFocus); event.Skip(); } diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index 69da2912c7..f522366b32 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -680,12 +680,15 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) } if ( panel && panel->GetDefaultItem() ) { - wxButton *def = panel->GetDefaultItem() ; - wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); - event.SetEventObject(def); - def->Command(event); - event.Skip() ; - return ; + wxButton *def = wxDynamicCast(panel->GetDefaultItem(), + wxButton); + if ( def && def->IsEnabled() ) + { + wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, def->GetId() ); + event.SetEventObject(def); + def->Command(event); + return ; + } } } //else: multiline controls need Enter for themselves diff --git a/src/mac/window.cpp b/src/mac/window.cpp index 32f583f2ec..3f12059d91 100644 --- a/src/mac/window.cpp +++ b/src/mac/window.cpp @@ -264,11 +264,9 @@ void wxWindowMac::SetFocus() } #endif // wxUSE_CARET // panel wants to track the window which was the last to have focus in it - wxPanel *panel = wxDynamicCast(GetParent(), wxPanel); - if ( panel ) - { - panel->SetLastFocus((wxWindow*)this); - } + wxChildFocusEvent eventFocus(this); + (void)GetEventHandler()->ProcessEvent(eventFocus); + #ifndef __WXUNIVERSAL__ wxControl* control = wxDynamicCast( gFocusWindow , wxControl ) ; if ( control && control->GetMacControl() ) @@ -1482,18 +1480,10 @@ void wxWindowMac::OnSetFocus(wxFocusEvent& event) // notice that it's also important to do it upwards the tree becaus // otherwise when the top level panel gets focus, it won't set it back to // us, but to some other sibling - wxWindowMac *win = this; - while ( win ) - { - wxWindowMac *parent = win->GetParent(); - wxPanel *panel = wxDynamicCast(parent, wxPanel); - if ( panel ) - { - panel->SetLastFocus(win); - } - - win = parent; - } + + // CS:don't know if this is still needed: + //wxChildFocusEvent eventFocus(this); + //(void)GetEventHandler()->ProcessEvent(eventFocus); event.Skip(); } diff --git a/src/makemac6.mcp b/src/makemac6.mcp index 3041dd62b0133c6b070a5d3a9492df5f6f90a78b..3c6efd0e391f676aae45df2ce4fbc11e7428c182 100644 GIT binary patch delta 1026 zcmYjQT}V_x6rOWu*1faq!WNsh+Tt4F8WBE;l?W|Z_L3R}1|}9I6#W?M3jN6jLY5EG zvc(M|f?kR&G}bto#M%#)JrvnPM3H4tizO)r*#_Ot?7h_v4D-$TzBzNwoHMD>P--+Z zxB@CUV?4-MsF$&FMwqjXXr%pcZNtVbk+!z-<<*{Gka+fsF(`Bpa4_veayyi2&NJQj zO>?L}d6MtW+n~(0tRRm-p0%H+V+AhSyOhcs7k zAO7$X6za)v!Uq%F2;K(~ukFMtKfK|b-Y)UnSE5`zTxYC&#yc^(6WW^Onw{+jqC55+ zh#2oLiD1038Cyo+BNys%F`R6wD?p;xhO<@RP%rPQRq-CgDWCYrb*jlJRTsRN4<#B-7m3H< z_({dd<}~?|r@2&hA`5dF5O;*ooX~GAGR&YX?|D1RX$qPSntAwk)+t}xUTqUsX znSQQJw;Cvi84!pWJzb_-t(3#`2y7^m#HeIdPyb7Un9rLeC1~|i4nqmXx)ftYoWraV zICDj=*WfEw^~+)r_)htF_eT%zp;fiIHNg9WuKJ4Y1M;<}@&jXHD``52RPApMmmu)> z?0-A>tLf}JjNOr31bjIf^;N6^BQ2y!N{oooFl^b-q74IUM(e%X)O_LaKKD7#^WNuj-$Ac+&})6P z5wa*DES(VR8A8?*#FRKsR989<(k{29`SPxMN8{0o2D}In0!9@A6`{@Y0mz`5D_5U{ z!vVG2$_}e{#w5vV1ZtFETR=;)4uOu)I&8m{5pf9O2z4zz>k;S)Js*!fp3oNQ(QbC8>DbE#d&`P&+g|)J+ z;m)IhBF8nn{jfJUEF%NGpbXZ&*_Ofh%x zY38nAau-+g@_z6!?igh_wQLB+Afl7TN;N9Uk|zxC(q~XQ>$acdo4aZ2L#cBcGhzM$ z;A#7r!OFd$S)@o@1pc_4HRVS`%_a&yCg9&_Q}S6TfAE&QglNi{cMMaGPHDd-we$uV z9s!REkDB)eHCx{=&#VIOe678axlDWn&O=)N3ef|+C{tWbeBC3i&gE+QpEv|O&?!17 z_<44hXcEi;Tn0mJ!|`hD%I-xA47hyE&yRJB6Z)(vLWF&&smDuYA7d4POWqY8QnJxI z$z1~?6U+t_FKLwBjTZEmqsGTOhQxVIiXG>d#pWyf94lSA)HN)cz{g({KanYuljwCD^7X$i#+C3>7 -- 2.50.0