Give some OSX specific methods OSX prefix, fixes hidden virtual method warning elsewhere

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index a0ac8a192114c4173fb039690b5973398c99a865..1137022d2163b2d409e3c9aa1619e5560c23c989 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -251,8 +251,8 @@ public:
 
     // osx specific event handling common for all osx-ports
     
-    virtual bool        HandleClicked( double timestampsec );
-    virtual bool        HandleKeyEvent( wxKeyEvent& event );
+    virtual bool        OSXHandleClicked( double timestampsec );
+    virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
 protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;

diff --git a/src/osx/button_osx.cpp b/src/osx/button_osx.cpp
index 526e3a6522a0502593e0226e00152a24f4b5c3e5..a33ef300123d3753b1be1563382cd5e1dce0bdfd 100644 (file)
--- a/src/osx/button_osx.cpp
+++ b/src/osx/button_osx.cpp
@@ -72,7 +72,7 @@ void wxButton::Command (wxCommandEvent & event)
     // ProcessCommand(event);
 }
 
-bool wxButton::HandleClicked( double timestampsec )
+bool wxButton::OSXHandleClicked( double timestampsec )
 {
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);
     event.SetEventObject(this);
@@ -111,7 +111,7 @@ bool wxDisclosureTriangle::IsOpen() const
    return m_peer->GetValue() == 1;
 }
 
-bool wxDisclosureTriangle::HandleClicked( double timestampsec )
+bool wxDisclosureTriangle::OSXHandleClicked( double timestampsec )
 {
     // Just emit button event for now
     wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, m_windowId);

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index 41469e71ab9598a1d8d12fec1d642f510f70de47..d7dc2db405f3118cd2c725fe4a56ebef3de94f57 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -1380,7 +1380,7 @@ bool wxApp::MacSendKeyDownEvent( wxWindow* focus , long keymessage , long modifi
     wxKeyEvent event(wxEVT_KEY_DOWN) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
 
-    return focus->HandleKeyEvent(event);
+    return focus->OSXHandleKeyEvent(event);
 }
 
 bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )
@@ -1392,7 +1392,7 @@ bool wxApp::MacSendKeyUpEvent( wxWindow* focus , long keymessage , long modifier
     wxKeyEvent event( wxEVT_KEY_UP ) ;
     MacCreateKeyEvent( event, focus , keymessage , modifiers , when , wherex , wherey , uniChar ) ;
 
-    return focus->HandleKeyEvent(event) ;
+    return focus->OSXHandleKeyEvent(event) ;
 }
 
 bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , short wherex , short wherey , wxChar uniChar )

diff --git a/src/osx/carbon/combobxc.cpp b/src/osx/carbon/combobxc.cpp
index 1f47fd78c899fe24ba36550fcf7f16595d540df2..16ac22ad1de153130b9b897ce8f649d1c5a756de 100644 (file)
--- a/src/osx/carbon/combobxc.cpp
+++ b/src/osx/carbon/combobxc.cpp
@@ -776,7 +776,7 @@ bool wxComboBox::CanRedo() const
 #endif
 }
 
-bool wxComboBox::HandleClicked( double timestampsec )
+bool wxComboBox::OSXHandleClicked( double timestampsec )
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());

diff --git a/src/osx/checkbox_osx.cpp b/src/osx/checkbox_osx.cpp
index 968e557a6ee25e432b8a52d53d465714fcef91fd..49751e2acdf03b8cb3b2173eaae1399296df3151 100644 (file)
--- a/src/osx/checkbox_osx.cpp
+++ b/src/osx/checkbox_osx.cpp
@@ -80,7 +80,7 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState val)
     m_peer->SetValue( val ) ;
 }
 
-bool wxCheckBox::HandleClicked( double timestampsec ) 
+bool wxCheckBox::OSXHandleClicked( double timestampsec ) 
 {
     bool sendEvent = true;
     wxCheckBoxState newState = Get3StateValue();

diff --git a/src/osx/choice_osx.cpp b/src/osx/choice_osx.cpp
index f871ed3d262d0aa5fc65973c7f072d71af69a929..15e68706841ba57062648fe1b7622107360d30bc 100644 (file)
--- a/src/osx/choice_osx.cpp
+++ b/src/osx/choice_osx.cpp
@@ -230,7 +230,7 @@ void * wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)m_datas[n];
 }
 
-bool wxChoice::HandleClicked( double timestampsec )
+bool wxChoice::OSXHandleClicked( double timestampsec )
 {
     wxCommandEvent event( wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 

diff --git a/src/osx/notebook_osx.cpp b/src/osx/notebook_osx.cpp
index 053c972bbe54e9ade0961a8979e253b04cef7c10..a0824ff991b5e2bdd0f59fdd9a0a6a64f79f7a0b 100644 (file)
--- a/src/osx/notebook_osx.cpp
+++ b/src/osx/notebook_osx.cpp
@@ -510,7 +510,7 @@ void wxNotebook::ChangePage(int nOldSel, int nSel)
     m_peer->SetValue( m_nSelection + 1 ) ;
 }
 
-bool wxNotebook::HandleClicked( double timestampsec )
+bool wxNotebook::OSXHandleClicked( double timestampsec )
 {
     bool status = false ;
 

diff --git a/src/osx/radiobut_osx.cpp b/src/osx/radiobut_osx.cpp
index a2908a0cf2d6f8382e1e14b2d98dd34d9cdb3e96..1ffcc72750547a63c1cb26c1cf65883f9288d9d6 100644 (file)
--- a/src/osx/radiobut_osx.cpp
+++ b/src/osx/radiobut_osx.cpp
@@ -106,7 +106,7 @@ void wxRadioButton::Command(wxCommandEvent& event)
     ProcessCommand( event );
 }
 
-bool wxRadioButton::HandleClicked( double timestampsec )
+bool wxRadioButton::OSXHandleClicked( double timestampsec )
 {
     if ( !m_peer->ButtonClickDidStateChange() )
     {

diff --git a/src/osx/scrolbar_osx.cpp b/src/osx/scrolbar_osx.cpp
index ab81178d22e8289f1bbe0a31e9f33742234c9b14..9b8371a172e754da06e58249324b649262fca80f 100644 (file)
--- a/src/osx/scrolbar_osx.cpp
+++ b/src/osx/scrolbar_osx.cpp
@@ -83,7 +83,7 @@ void wxScrollBar::Command( wxCommandEvent& event )
     ProcessCommand( event );
 }
 
-bool wxScrollBar::HandleClicked( double timestampsec )
+bool wxScrollBar::OSXHandleClicked( double timestampsec )
 {
     int new_pos = m_peer->GetValue();
 

diff --git a/src/osx/slider_osx.cpp b/src/osx/slider_osx.cpp
index 9452df9badc9bf850fed8c240fc679052fe92a7c..ce4815ad3d9e2c028f8a115677372631ecb99eef 100644 (file)
--- a/src/osx/slider_osx.cpp
+++ b/src/osx/slider_osx.cpp
@@ -296,7 +296,7 @@ void wxSlider::TriggerScrollEvent( wxEventType scrollEvent)
     HandleWindowEvent( cevent );
 }
 
-bool wxSlider::HandleClicked( double timestampsec )
+bool wxSlider::OSXHandleClicked( double timestampsec )
 {
     TriggerScrollEvent(wxEVT_SCROLL_THUMBRELEASE);
  

diff --git a/src/osx/spinbutt_osx.cpp b/src/osx/spinbutt_osx.cpp
index 15ea37ef379a768810ffc5e641db8df3f316ac52..b8c669c1543108803328562254b06e05b65533f8 100644 (file)
--- a/src/osx/spinbutt_osx.cpp
+++ b/src/osx/spinbutt_osx.cpp
@@ -79,7 +79,7 @@ void wxSpinButton::SendThumbTrackEvent()
     HandleWindowEvent( event );
 }
 
-bool wxSpinButton::HandleClicked( double timestampsec )
+bool wxSpinButton::OSXHandleClicked( double timestampsec )
 {
     // all events have already been processed
     return true;

diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 4aff7506b6886aaa4f6678091b8f3be3d232852a..7ba448c9914102daee2ca7c82a116d969dfe3c33 100644 (file)
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -89,7 +89,7 @@ void wxToggleButton::Command(wxCommandEvent & event)
    ProcessCommand(event);
 }
 
-bool wxToggleButton::HandleClicked( double timestampsec ) 
+bool wxToggleButton::OSXHandleClicked( double timestampsec ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());
@@ -156,7 +156,7 @@ void wxBitmapToggleButton::Command(wxCommandEvent & event)
    ProcessCommand(event);
 }
 
-bool wxBitmapToggleButton::HandleClicked( double timestampsec ) 
+bool wxBitmapToggleButton::OSXHandleClicked( double timestampsec ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 8231ba5bb3ffd5a8443b9363f1a64156e21a4f89..55aea5d8151fb0a20fe11f81a7db10078bec1d0e 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -2222,7 +2222,7 @@ Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const
     return bounds ;
 }
 
-bool wxWindowMac::HandleClicked( double timestampsec )
+bool wxWindowMac::OSXHandleClicked( double timestampsec )
 {
     return false;
 }
@@ -2230,7 +2230,7 @@ bool wxWindowMac::HandleClicked( double timestampsec )
 wxInt32 wxWindowMac::MacControlHit(WXEVENTHANDLERREF WXUNUSED(handler) , WXEVENTREF event )
 {
 #if wxOSX_USE_COCOA_OR_CARBON
-    if ( HandleClicked( GetEventTime((EventRef)event) ) )
+    if ( OSXHandleClicked( GetEventTime((EventRef)event) ) )
         return noErr;
         
     return eventNotHandledErr ;
@@ -2296,7 +2296,7 @@ bool wxWindowMac::IsShownOnScreen() const
     return wxWindowBase::IsShownOnScreen();
 }
 
-bool wxWindowMac::HandleKeyEvent( wxKeyEvent& event )
+bool wxWindowMac::OSXHandleKeyEvent( wxKeyEvent& event )
 {
     bool handled = HandleWindowEvent( event ) ;
     if ( handled && event.GetSkipped() )