Don't hardcode the number of toolbar tools in the toolbar sample.

[wxWidgets.git] / samples / keyboard / keyboard.cpp

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index f218f6bbaf9cfb1bf218f2ed18424ad65a30ac56..25907b5a4c4b9f16f7b0bce7953c5af4a0dbbce2 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -132,7 +132,7 @@ MyFrame::MyFrame(const wxString& title)
     SetMenuBar(menuBar);
 
     m_inputWin = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 50),
     SetMenuBar(menuBar);
 
     m_inputWin = new wxWindow(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 50),

-                              wxRAISED_BORDER),
+                              wxRAISED_BORDER);

     m_inputWin->SetBackgroundColour(*wxBLUE);
 
     wxTextCtrl *headerText = new wxTextCtrl(this, wxID_ANY, "",
     m_inputWin->SetBackgroundColour(*wxBLUE);
 
     wxTextCtrl *headerText = new wxTextCtrl(this, wxID_ANY, "",


@@ -338,7 +338,9 @@ const char* GetVirtualKeyCodeName(int keycode)
 
         WXK_(WINDOWS_LEFT)
         WXK_(WINDOWS_RIGHT)
 
         WXK_(WINDOWS_LEFT)
         WXK_(WINDOWS_RIGHT)

-        WXK_(COMMAND)
+#ifdef __WXOSX__
+        WXK_(RAW_CONTROL)
+#endif

 #undef WXK_
 
     default:
 #undef WXK_
 
     default: