Use system default font for all platforms

[wxWidgets.git] / src / generic / grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 49561b6498bc62b42a9cda81f12cd96aa7ef0055..65a3603c05aef9ecabc2a4567fcb6691c02b061e 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,11 +620,11 @@ 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...

-    long pos = Text()->GetInsertionPoint();
+    size_t pos = (size_t)( Text()->GetInsertionPoint() );

     wxString s( Text()->GetValue() );
     s = s.Left(pos) + "\n" + s.Mid(pos);
     Text()->SetValue(s);
     wxString s( Text()->GetValue() );
     s = s.Left(pos) + "\n" + s.Mid(pos);
     Text()->SetValue(s);


@@ -7606,6 +7606,12 @@ void wxGrid::Fit()
     AutoSize();
 }
 
     AutoSize();
 }
 

+
+wxPen& wxGrid::GetDividerPen() const
+{
+    return wxNullPen;
+}
+

 // ----------------------------------------------------------------------------
 // cell value accessor functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // cell value accessor functions
 // ----------------------------------------------------------------------------