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

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        OSXHandleClicked( double timestampsec );
-    virtual bool        HandleKeyEvent( wxKeyEvent& event );
+    virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
 protected:
     // For controls like radio buttons which are genuinely composite
     wxList              m_subControls;

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);

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 )

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());

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();

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 );
 

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 ;
 

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() )
     {

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();
 

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);
  

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;

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());

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() )