Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New virtual key defines (NUMPAD_XXX).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-17 12:27:27 +00:00
parent 97560ce3a4
commit adde8c9807
3 changed files with 110 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
include/wx/defs.h
View File

@@ -792,82 +792,109 @@ enum wxDataFormat
enum wxKeyCode enum wxKeyCode
{ {
WXK_BACK = 8, WXK_BACK = 8,
WXK_TAB = 9, WXK_TAB = 9,
WXK_RETURN = 13, WXK_RETURN = 13,
WXK_ESCAPE = 27, WXK_ESCAPE = 27,
WXK_SPACE = 32, WXK_SPACE = 32,
WXK_DELETE = 127, WXK_DELETE = 127,
WXK_START = 300, WXK_START = 300,
WXK_LBUTTON, WXK_LBUTTON,
WXK_RBUTTON, WXK_RBUTTON,
WXK_CANCEL, WXK_CANCEL,
WXK_MBUTTON, WXK_MBUTTON,
WXK_CLEAR, WXK_CLEAR,
WXK_SHIFT, WXK_SHIFT,
WXK_CONTROL, WXK_CONTROL,
WXK_MENU, WXK_MENU,
WXK_PAUSE, WXK_PAUSE,
WXK_CAPITAL, WXK_CAPITAL,
WXK_PRIOR, /* Page up */ WXK_PRIOR, /* Page up */
WXK_NEXT, /* Page down */ WXK_NEXT, /* Page down */
WXK_END, WXK_END,
WXK_HOME, WXK_HOME,
WXK_LEFT, WXK_LEFT,
WXK_UP, WXK_UP,
WXK_RIGHT, WXK_RIGHT,
WXK_DOWN, WXK_DOWN,
WXK_SELECT, WXK_SELECT,
WXK_PRINT, WXK_PRINT,
WXK_EXECUTE, WXK_EXECUTE,
WXK_SNAPSHOT, WXK_SNAPSHOT,
WXK_INSERT, WXK_INSERT,
WXK_HELP, WXK_HELP,
WXK_NUMPAD0, WXK_NUMPAD0,
WXK_NUMPAD1, WXK_NUMPAD1,
WXK_NUMPAD2, WXK_NUMPAD2,
WXK_NUMPAD3, WXK_NUMPAD3,
WXK_NUMPAD4, WXK_NUMPAD4,
WXK_NUMPAD5, WXK_NUMPAD5,
WXK_NUMPAD6, WXK_NUMPAD6,
WXK_NUMPAD7, WXK_NUMPAD7,
WXK_NUMPAD8, WXK_NUMPAD8,
WXK_NUMPAD9, WXK_NUMPAD9,
WXK_MULTIPLY, WXK_MULTIPLY,
WXK_ADD, WXK_ADD,
WXK_SEPARATOR, WXK_SEPARATOR,
WXK_SUBTRACT, WXK_SUBTRACT,
WXK_DECIMAL, WXK_DECIMAL,
WXK_DIVIDE, WXK_DIVIDE,
WXK_F1, WXK_F1,
WXK_F2, WXK_F2,
WXK_F3, WXK_F3,
WXK_F4, WXK_F4,
WXK_F5, WXK_F5,
WXK_F6, WXK_F6,
WXK_F7, WXK_F7,
WXK_F8, WXK_F8,
WXK_F9, WXK_F9,
WXK_F10, WXK_F10,
WXK_F11, WXK_F11,
WXK_F12, WXK_F12,
WXK_F13, WXK_F13,
WXK_F14, WXK_F14,
WXK_F15, WXK_F15,
WXK_F16, WXK_F16,
WXK_F17, WXK_F17,
WXK_F18, WXK_F18,
WXK_F19, WXK_F19,
WXK_F20, WXK_F20,
WXK_F21, WXK_F21,
WXK_F22, WXK_F22,
WXK_F23, WXK_F23,
WXK_F24, WXK_F24,
WXK_NUMLOCK, WXK_NUMLOCK,
WXK_SCROLL, WXK_SCROLL,
WXK_PAGEUP, WXK_PAGEUP,
WXK_PAGEDOWN WXK_PAGEDOWN,
WXK_NUMPAD_SPACE,
WXK_NUMPAD_TAB,
WXK_NUMPAD_ENTER,
WXK_NUMPAD_F1,
WXK_NUMPAD_F2,
WXK_NUMPAD_F3,
WXK_NUMPAD_F4,
WXK_NUMPAD_HOME,
WXK_NUMPAD_LEFT,
WXK_NUMPAD_UP,
WXK_NUMPAD_RIGHT,
WXK_NUMPAD_DOWN,
WXK_NUMPAD_PRIOR,
WXK_NUMPAD_PAGEUP,
WXK_NUMPAD_PAGEDOWN,
WXK_NUMPAD_END,
WXK_NUMPAD_BEGIN,
WXK_NUMPAD_INSERT,
WXK_NUMPAD_DELETE,
WXK_NUMPAD_EQUAL,
WXK_NUMPAD_MULTIPLY,
WXK_NUMPAD_ADD,
WXK_NUMPAD_SEPARATOR,
WXK_NUMPAD_SUBTRACT,
WXK_NUMPAD_DECIMAL,
WXK_NUMPAD_DIVIDE
}; };
/* OS mnemonics -- Identify the running OS (useful for Windows) /* OS mnemonics -- Identify the running OS (useful for Windows)

8
src/gtk/mdi.cpp
View File

@@ -311,11 +311,11 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
void wxMDIChildFrame::Activate() void wxMDIChildFrame::Activate()
{ {
#if( GTK_MINOR_VERSION>0 ) #if (GTK_MINOR_VERSION > 0)
wxMDIParentFrame* parent = (wxMDIParentFrame*)GetParent(); wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget); GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
gint pageno = gtk_notebook_page_num(notebook,m_page->child); gint pageno = gtk_notebook_page_num( notebook, m_page->child );
gtk_notebook_set_page(notebook,pageno); gtk_notebook_set_page( notebook, pageno );
#else #else
// the only way I can see to do this under gtk+ 1.0.X would // the only way I can see to do this under gtk+ 1.0.X would
// be to keep track of page numbers, start at first and // be to keep track of page numbers, start at first and

8
src/gtk1/mdi.cpp
View File

@@ -311,11 +311,11 @@ wxMenuBar *wxMDIChildFrame::GetMenuBar() const
void wxMDIChildFrame::Activate() void wxMDIChildFrame::Activate()
{ {
#if( GTK_MINOR_VERSION>0 ) #if (GTK_MINOR_VERSION > 0)
wxMDIParentFrame* parent = (wxMDIParentFrame*)GetParent(); wxMDIParentFrame* parent = (wxMDIParentFrame*) GetParent();
GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget); GtkNotebook* notebook = GTK_NOTEBOOK(parent->m_widget);
gint pageno = gtk_notebook_page_num(notebook,m_page->child); gint pageno = gtk_notebook_page_num( notebook, m_page->child );
gtk_notebook_set_page(notebook,pageno); gtk_notebook_set_page( notebook, pageno );
#else #else
// the only way I can see to do this under gtk+ 1.0.X would // the only way I can see to do this under gtk+ 1.0.X would
// be to keep track of page numbers, start at first and // be to keep track of page numbers, start at first and