]>
Commit | Line | Data |
---|---|---|
14227991 AM |
1 | --- bochs-2.3/gui/wx.cc.org 2006-12-16 03:08:18.928681500 +0100 |
2 | +++ bochs-2.3/gui/wx.cc 2006-12-16 03:12:05.546844250 +0100 | |
3 | @@ -821,9 +821,13 @@ | |
4 | case WXK_NUMPAD_UP: bx_key = BX_KEY_KP_UP; break; | |
5 | case WXK_NUMPAD_RIGHT: bx_key = BX_KEY_KP_RIGHT; break; | |
6 | case WXK_NUMPAD_DOWN: bx_key = BX_KEY_KP_DOWN; break; | |
7 | +#if WXK_NUMPAD_PRIOR != WXK_NUMPAD_PAGEUP | |
8 | case WXK_NUMPAD_PRIOR: bx_key = BX_KEY_KP_PAGE_UP; break; | |
9 | +#endif | |
10 | case WXK_NUMPAD_PAGEUP: bx_key = BX_KEY_KP_PAGE_UP; break; | |
11 | +#if WXK_NUMPAD_NEXT != WXK_NUMPAD_PAGEDOWN | |
12 | case WXK_NUMPAD_NEXT: bx_key = BX_KEY_KP_PAGE_DOWN; break; | |
13 | +#endif | |
14 | case WXK_NUMPAD_PAGEDOWN: bx_key = BX_KEY_KP_PAGE_DOWN; break; | |
15 | case WXK_NUMPAD_END: bx_key = BX_KEY_KP_END; break; | |
16 | case WXK_NUMPAD_BEGIN: bx_key = BX_KEY_KP_HOME; break; | |
17 | @@ -849,7 +853,8 @@ | |
18 | case 220: bx_key = BX_KEY_BACKSLASH; break; // \| | |
19 | case 222: bx_key = BX_KEY_SINGLE_QUOTE; break; // '" | |
20 | case 305: bx_key = BX_KEY_KP_5; break; // keypad 5 | |
21 | - case 392: bx_key = BX_KEY_KP_ADD; break; // keypad plus | |
22 | +/* same as WXK_NUMPAD_DIVIDE ?! */ | |
23 | +// case 392: bx_key = BX_KEY_KP_ADD; break; // keypad plus | |
24 | ||
25 | default: | |
26 | wxLogMessage(wxT ("Unhandled key event: %i (0x%x)"), key, key); | |
27 | --- bochs-2.3/gui/wxdialog.h.org 2006-12-16 03:16:44.252262250 +0100 | |
28 | +++ bochs-2.3/gui/wxdialog.h 2006-12-16 03:19:08.005246250 +0100 | |
29 | @@ -5,6 +5,7 @@ | |
30 | // wxWidgets dialogs for Bochs | |
31 | ||
32 | #include <wx/spinctrl.h> | |
33 | +#include <wx/notebook.h> | |
34 | ||
35 | //////////////////////////////////////////////////////////////////// | |
36 | // text messages used in several places | |
37 | --- bochs-2.3/gui/wxdialog.cc.org 2006-12-16 03:20:44.187257250 +0100 | |
38 | +++ bochs-2.3/gui/wxdialog.cc 2006-12-16 03:21:14.213133750 +0100 | |
39 | @@ -818,7 +818,7 @@ | |
40 | { | |
41 | paramHash->BeginFind(); | |
42 | wxNode *node; | |
43 | - while ((node = paramHash->Next()) != NULL) { | |
44 | + while ((node = (wxNode *)paramHash->Next()) != NULL) { | |
45 | // assume that no ParamStruct appears in the hash table under multiple | |
46 | // keys. If so, we will delete it twice and corrupt memory. | |
47 | ParamStruct *pstr = (ParamStruct*) node->GetData(); | |
48 | @@ -1129,7 +1129,7 @@ | |
49 | // loop through all the parameters | |
50 | idHash->BeginFind(); | |
51 | wxNode *node; | |
52 | - while ((node = idHash->Next()) != NULL) { | |
53 | + while ((node = (wxNode *)idHash->Next()) != NULL) { | |
54 | ParamStruct *pstr = (ParamStruct*) node->GetData(); | |
55 | wxLogDebug(wxT("commit changes for param %s"), pstr->param->get_name()); | |
56 | int type = pstr->param->get_type(); | |
57 | @@ -1209,7 +1209,7 @@ | |
58 | { | |
59 | idHash->BeginFind(); | |
60 | wxNode *node; | |
61 | - while ((node = idHash->Next ()) != NULL) { | |
62 | + while ((node = (wxNode *)idHash->Next ()) != NULL) { | |
63 | ParamStruct *pstr = (ParamStruct*) node->GetData(); | |
64 | if (pstr->param->get_type() == BXT_PARAM_BOOL) | |
65 | EnableChanged(pstr); | |
66 | @@ -1410,7 +1410,7 @@ | |
67 | // loop through all the parameters | |
68 | idHash->BeginFind (); | |
69 | wxNode *node; | |
70 | - while ((node = idHash->Next ()) != NULL) { | |
71 | + while ((node = (wxNode *)idHash->Next ()) != NULL) { | |
72 | ParamStruct *pstr = (ParamStruct*) node->GetData (); | |
73 | IFDBG_DLG(wxLogDebug(wxT("refresh param %s"), pstr->param->get_name())); | |
74 | int type = pstr->param->get_type (); |