*** empty log message ***

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 49561b6498bc62b42a9cda81f12cd96aa7ef0055..592c3908543c5e606d5e0935e6a19f9d6c55a846 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -52,10 +52,10 @@
 #include "wx/grid.h"
 #include "wx/generic/gridsel.h"
 
 #include "wx/grid.h"
 #include "wx/generic/gridsel.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #define WXUNUSED_GTK_AND_MOTIF(identifier)  WXUNUSED(identifier)
+#if defined(__WXMOTIF__)
+    #define WXUNUSED_MOTIF(identifier)  WXUNUSED(identifier)

 #else
 #else

-    #define WXUNUSED_GTK_AND_MOTIF(identifier)  identifier
+    #define WXUNUSED_MOTIF(identifier)  identifier

 #endif
 
 #if defined(__WXGTK__)
 #endif
 
 #if defined(__WXGTK__)


@@ -620,7 +620,7 @@ void wxGridCellTextEditor::StartingKey(wxKeyEvent& event)
 }
 
 void wxGridCellTextEditor::HandleReturn( wxKeyEvent&
 }
 
 void wxGridCellTextEditor::HandleReturn( wxKeyEvent&

-                                         WXUNUSED_GTK_AND_MOTIF(event) )
+                                         WXUNUSED_GTK(WXUNUSED_MOTIF(event)) )

 {
 #if defined(__WXMOTIF__) || defined(__WXGTK__)
     // wxMotif needs a little extra help...
 {
 #if defined(__WXMOTIF__) || defined(__WXGTK__)
     // wxMotif needs a little extra help...