initialize GdkColor so code which incorrectly accesses it will work as well as it...

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index f54c31bd7edb3ae24e17184c6235212808b1aaf1..6794b49c3e5d0c9499dee7fa69e1cbd48b300080 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -29,6 +29,7 @@
     #include "wx/valtext.h"
     #include "wx/intl.h"
     #include "wx/math.h"
     #include "wx/valtext.h"
     #include "wx/intl.h"
     #include "wx/math.h"

+    #include "wx/listbox.h"

 #endif
 
 #include "wx/textfile.h"
 #endif
 
 #include "wx/textfile.h"


@@ -4172,10 +4173,6 @@ wxGrid::~wxGrid()
 // be removed as well as the #else cases below.
 #define _USE_VISATTR 0
 
 // be removed as well as the #else cases below.
 #define _USE_VISATTR 0
 

-#if _USE_VISATTR
-#include "wx/listbox.h"
-#endif
-

 void wxGrid::Create()
 {
     // set to true by CreateGrid
 void wxGrid::Create()
 {
     // set to true by CreateGrid


@@ -5601,23 +5598,26 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
         switch ( m_cursorMode )
         {
             case WXGRID_CURSOR_RESIZE_COL:
         switch ( m_cursorMode )
         {
             case WXGRID_CURSOR_RESIZE_COL:

-            {

                 DoEndDragResizeCol();
 
                 // Note: we are ending the event *after* doing
                 // default processing in this case
                 //
                 SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );
                 DoEndDragResizeCol();
 
                 // Note: we are ending the event *after* doing
                 // default processing in this case
                 //
                 SendEvent( wxEVT_GRID_COL_SIZE, -1, m_dragRowOrCol, event );

-            }
-            break;
+                break;

 
             case WXGRID_CURSOR_MOVE_COL:
 
             case WXGRID_CURSOR_MOVE_COL:

-            {

                 DoEndDragMoveCol();
 
                 SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event );
                 DoEndDragMoveCol();
 
                 SendEvent( wxEVT_GRID_COL_MOVE, -1, m_dragRowOrCol, event );

-            }
-            break;
+                break;
+
+            case WXGRID_CURSOR_SELECT_COL:
+            case WXGRID_CURSOR_SELECT_CELL:
+            case WXGRID_CURSOR_RESIZE_ROW:
+            case WXGRID_CURSOR_SELECT_ROW:
+                // nothing to do (?)
+                break;

         }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);
         }
 
         ChangeCursorMode(WXGRID_CURSOR_SELECT_CELL, m_colLabelWin);