move wxGridCellRenderer::Draw before other derived classes implementations (no real...

[wxWidgets.git] / src / osx / tglbtn_osx.cpp

diff --git a/src/osx/tglbtn_osx.cpp b/src/osx/tglbtn_osx.cpp
index 639a85d4bab6f374ff122a7608f4fbb7f9b7c037..05d94f6ea5e09ef2ec0a859cd0054b45101872dc 100644 (file)
--- a/src/osx/tglbtn_osx.cpp
+++ b/src/osx/tglbtn_osx.cpp
@@ -24,14 +24,14 @@
 
 #include "wx/tglbtn.h"
 #include "wx/osx/private.h"
 
 #include "wx/tglbtn.h"
 #include "wx/osx/private.h"

-#include "wx/osx/bmpbuttn.h"   // for wxDEFAULT_BUTTON_MARGIN
+#include "wx/bmpbuttn.h"       // for wxDEFAULT_BUTTON_MARGIN

 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -89,7 +89,7 @@ void wxToggleButton::Command(wxCommandEvent & event)
    ProcessCommand(event);
 }
 
    ProcessCommand(event);
 }
 

-bool wxToggleButton::HandleClicked( double timestampsec ) 
+bool wxToggleButton::OSXHandleClicked( double timestampsec ) 

 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());
 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());


@@ -156,7 +156,7 @@ void wxBitmapToggleButton::Command(wxCommandEvent & event)
    ProcessCommand(event);
 }
 
    ProcessCommand(event);
 }
 

-bool wxBitmapToggleButton::HandleClicked( double timestampsec ) 
+bool wxBitmapToggleButton::OSXHandleClicked( double timestampsec ) 

 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());
 {
     wxCommandEvent event(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, m_windowId);
     event.SetInt(GetValue());