diff options
Diffstat (limited to 'wx+')
| -rw-r--r-- | wx+/bitmap_button.h | 1 | ||||
| -rw-r--r-- | wx+/grid.cpp | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/wx+/bitmap_button.h b/wx+/bitmap_button.h index 6c186926..960e4579 100644 --- a/wx+/bitmap_button.h +++ b/wx+/bitmap_button.h @@ -10,6 +10,7 @@ #include <wx/bmpbuttn.h> #include "image_tools.h" + namespace zen { //zen::BitmapTextButton is identical to wxBitmapButton, but preserves the label via SetLabel(), which wxFormbuilder would ditch! diff --git a/wx+/grid.cpp b/wx+/grid.cpp index b24fabdc..9eea2e28 100644 --- a/wx+/grid.cpp +++ b/wx+/grid.cpp @@ -1522,8 +1522,8 @@ void Grid::onKeyDown(wxKeyEvent& event) case WXK_NUMPAD_HOME: if (event.ShiftDown()) selectWithCursorTo(0); - else if (event.ControlDown()) - moveCursorTo(0); + //else if (event.ControlDown()) + // ; else moveCursorTo(0); return; @@ -1532,8 +1532,8 @@ void Grid::onKeyDown(wxKeyEvent& event) case WXK_NUMPAD_END: if (event.ShiftDown()) selectWithCursorTo(rowCount - 1); - else if (event.ControlDown()) - moveCursorTo(rowCount - 1); + //else if (event.ControlDown()) + // ; else moveCursorTo(rowCount - 1); return; @@ -1542,8 +1542,8 @@ void Grid::onKeyDown(wxKeyEvent& event) case WXK_NUMPAD_PAGEUP: if (event.ShiftDown()) selectWithCursorTo(cursorRow - GetClientSize().GetHeight() / rowLabelWin_->getRowHeight()); - else if (event.ControlDown()) - ; + //else if (event.ControlDown()) + // ; else moveCursorTo(cursorRow - GetClientSize().GetHeight() / rowLabelWin_->getRowHeight()); return; @@ -1552,8 +1552,8 @@ void Grid::onKeyDown(wxKeyEvent& event) case WXK_NUMPAD_PAGEDOWN: if (event.ShiftDown()) selectWithCursorTo(cursorRow + GetClientSize().GetHeight() / rowLabelWin_->getRowHeight()); - else if (event.ControlDown()) - ; + //else if (event.ControlDown()) + // ; else moveCursorTo(cursorRow + GetClientSize().GetHeight() / rowLabelWin_->getRowHeight()); return; |