Fix wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event type name.

Fix incorrect conflict resolution between the changes of r73823 and r73850:
the first renamed wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED to
wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK while the latter renamed it
to wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED. The proper new name is
wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, use it instead.

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

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 01ff2e248561a5cf0319b42843a8cdf02cc727bc..d4a20cd610c5512300133528b064bdd4271ccd79 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -879,7 +879,7 @@ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wx
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );

-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED, wxDataViewEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );

 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
 
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
 wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
 


@@ -1337,7 +1337,7 @@ private:
 #define wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED          wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
 #define wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU           wxEVT_DATAVIEW_ITEM_CONTEXT_MENU
 #define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK         wxEVT_DATAVIEW_COLUMN_HEADER_CLICK
 #define wxEVT_COMMAND_DATAVIEW_ITEM_VALUE_CHANGED          wxEVT_DATAVIEW_ITEM_VALUE_CHANGED
 #define wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU           wxEVT_DATAVIEW_ITEM_CONTEXT_MENU
 #define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_CLICK         wxEVT_DATAVIEW_COLUMN_HEADER_CLICK

-#define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK   wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED
+#define wxEVT_COMMAND_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK   wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK

 #define wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED               wxEVT_DATAVIEW_COLUMN_SORTED
 #define wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED            wxEVT_DATAVIEW_COLUMN_REORDERED
 #define wxEVT_COMMAND_DATAVIEW_CACHE_HINT                  wxEVT_DATAVIEW_CACHE_HINT
 #define wxEVT_COMMAND_DATAVIEW_COLUMN_SORTED               wxEVT_DATAVIEW_COLUMN_SORTED
 #define wxEVT_COMMAND_DATAVIEW_COLUMN_REORDERED            wxEVT_DATAVIEW_COLUMN_REORDERED
 #define wxEVT_COMMAND_DATAVIEW_CACHE_HINT                  wxEVT_DATAVIEW_CACHE_HINT

diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index b4f4abb924dfdc4edbe59ee47f509ac807cc8cff..aad28580a02d19c533370e370ee9c4aa124ec1a5 100644 (file)
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -784,7 +784,7 @@ wxEventType wxEVT_DATAVIEW_ITEM_VALUE_CHANGED;
 wxEventType wxEVT_DATAVIEW_ITEM_CONTEXT_MENU;
 
 wxEventType wxEVT_DATAVIEW_COLUMN_HEADER_CLICK;
 wxEventType wxEVT_DATAVIEW_ITEM_CONTEXT_MENU;
 
 wxEventType wxEVT_DATAVIEW_COLUMN_HEADER_CLICK;

-wxEventType wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED;
+wxEventType wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK;

 wxEventType wxEVT_DATAVIEW_COLUMN_SORTED;
 wxEventType wxEVT_DATAVIEW_COLUMN_REORDERED;
 wxEventType wxEVT_DATAVIEW_CACHE_HINT;
 wxEventType wxEVT_DATAVIEW_COLUMN_SORTED;
 wxEventType wxEVT_DATAVIEW_COLUMN_REORDERED;
 wxEventType wxEVT_DATAVIEW_CACHE_HINT;


@@ -876,7 +876,7 @@ wxEventType wxEVT_DATAVIEW_ITEM_DROP;
     @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_CLICK event.
     @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}
     @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_CLICK event.
     @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}

-           Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED event.
+           Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event.

            Notice that currently this event is not generated in the native OS X
            versions of the control.
     @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}
            Notice that currently this event is not generated in the native OS X
            versions of the control.
     @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}


@@ -3254,7 +3254,7 @@ public:
     @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_CLICK event.
     @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}
     @event{EVT_DATAVIEW_COLUMN_HEADER_CLICK(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_CLICK event.
     @event{EVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK(id, func)}

-           Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED event.
+           Process a @c wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK event.

     @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_SORTED event.
     @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}
     @event{EVT_DATAVIEW_COLUMN_SORTED(id, func)}
            Process a @c wxEVT_DATAVIEW_COLUMN_SORTED event.
     @event{EVT_DATAVIEW_COLUMN_REORDERED(id, func)}

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index e7f608e88c5020f13ea0aa1c28140339cce05b90..ca1a74ae2429a9771a2ea2e062a6739aacdb4ec2 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -1088,7 +1088,7 @@ void MyFrame::OnHeaderRightClick( wxDataViewEvent &event )
 {
     int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );
 
 {
     int pos = m_ctrl[0]->GetColumnPosition( event.GetDataViewColumn() );
 

-    wxLogMessage( "wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED, Column position: %d", pos );
+    wxLogMessage( "wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, Column position: %d", pos );

 }
 
 void MyFrame::OnSorted( wxDataViewEvent &event )
 }
 
 void MyFrame::OnSorted( wxDataViewEvent &event )

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index a6478876458662cb1539ee10131fac50b73dd62b..84bc6b2b21051304ec4f5b346fe2060164f3e54b 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -1411,7 +1411,7 @@ wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_VALUE_CHANGED, wxDataViewEvent );
 wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
 
 wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );
 wxDEFINE_EVENT( wxEVT_DATAVIEW_ITEM_CONTEXT_MENU, wxDataViewEvent );
 
 wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_CLICK, wxDataViewEvent );

-wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED, wxDataViewEvent );
+wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, wxDataViewEvent );

 wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
 wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
 
 wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_SORTED, wxDataViewEvent );
 wxDEFINE_EVENT( wxEVT_DATAVIEW_COLUMN_REORDERED, wxDataViewEvent );
 

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index a23a0a354923cfcba8a0250e6e9d2fd6c4bbf5bd..96c1f5060964bf44c0a6c04aa428980c7bbee4e9 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -284,7 +284,7 @@ private:
 
     void OnRClick(wxHeaderCtrlEvent& event)
     {
 
     void OnRClick(wxHeaderCtrlEvent& event)
     {

-        if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED,
+        if ( !SendEvent(wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK,

                         event.GetColumn()) )
             event.Skip();
     }
                         event.GetColumn()) )
             event.Skip();
     }

diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp
index cc2860cef7443144ea3e7dae5dc87dbd50878f19..28ff67d5d7da289e8e10a6fc045f1a351cb2564b 100644 (file)
--- a/src/gtk/dataview.cpp
+++ b/src/gtk/dataview.cpp
@@ -2854,7 +2854,7 @@ gtk_dataview_header_button_press_callback( GtkWidget *WXUNUSED(widget),
     if (gdk_event->button == 3)
     {
         wxDataViewCtrl *dv = column->GetOwner();
     if (gdk_event->button == 3)
     {
         wxDataViewCtrl *dv = column->GetOwner();

-        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICKED, dv->GetId() );
+        wxDataViewEvent event( wxEVT_DATAVIEW_COLUMN_HEADER_RIGHT_CLICK, dv->GetId() );

         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
         if (dv->HandleWindowEvent( event ))
         event.SetDataViewColumn( column );
         event.SetModel( dv->GetModel() );
         if (dv->HandleWindowEvent( event ))