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

Added fixes for Unicode compilation.

Browse Source 
Added WXK_ALT incl test.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-28 16:10:01 +00:00
parent 0c08906562
commit 861ccde481
10 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/defs.h
View File

@@ -829,6 +829,7 @@ enum wxKeyCode
WXK_MBUTTON, WXK_MBUTTON,
WXK_CLEAR, WXK_CLEAR,
WXK_SHIFT, WXK_SHIFT,
WXK_ALT,
WXK_CONTROL, WXK_CONTROL,
WXK_MENU, WXK_MENU,
WXK_PAUSE, WXK_PAUSE,

2
locale/de.po
View File

@@ -41,7 +41,7 @@ msgstr " (Fehler %ld: %s)"
#: ../src/common/date.cpp:385 ../src/common/date.cpp:400 #: ../src/common/date.cpp:385 ../src/common/date.cpp:400
#: src/common/date.cpp:384 src/common/date.cpp:399 #: src/common/date.cpp:384 src/common/date.cpp:399
msgid " B.C." msgid " B.C."
msgstr " B.C." msgstr " v.Chr."
#: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1334 #: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1334
#: ../src/common/resource.cpp:1630 ../src/common/resource.cpp:2704 #: ../src/common/resource.cpp:1630 ../src/common/resource.cpp:2704

27
samples/controls/controls.cpp
View File

@@ -83,8 +83,8 @@ public:
void OnChar(wxKeyEvent& event); void OnChar(wxKeyEvent& event);
private: private:
static inline char GetChar(bool on, char c) { return on ? c : '-'; } static inline wxChar GetChar(bool on, wxChar c) { return on ? c : _T('-'); }
void LogEvent(const char *name, wxKeyEvent& event) const; void LogEvent(const wxChar *name, wxKeyEvent& event) const;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@@ -231,12 +231,12 @@ BEGIN_EVENT_TABLE(MyTextCtrl, wxTextCtrl)
EVT_CHAR(MyTextCtrl::OnChar) EVT_CHAR(MyTextCtrl::OnChar)
END_EVENT_TABLE() END_EVENT_TABLE()
void MyTextCtrl::LogEvent(const char *name, wxKeyEvent& event) const void MyTextCtrl::LogEvent(const wxChar *name, wxKeyEvent& event) const
{ {
wxString key; wxString key;
long keycode = event.KeyCode(); long keycode = event.KeyCode();
if ( isprint((int)keycode) ) if ( wxIsprint((int)keycode) )
key.Printf("'%c'", (char)keycode); key.Printf( _T("'%c'") , (char)keycode);
else else
{ {
switch ( keycode ) switch ( keycode )
@@ -254,6 +254,7 @@ void MyTextCtrl::LogEvent(const char *name, wxKeyEvent& event) const
case WXK_MBUTTON: key = "MBUTTON"; break; case WXK_MBUTTON: key = "MBUTTON"; break;
case WXK_CLEAR: key = "CLEAR"; break; case WXK_CLEAR: key = "CLEAR"; break;
case WXK_SHIFT: key = "SHIFT"; break; case WXK_SHIFT: key = "SHIFT"; break;
case WXK_ALT: key = "ALT"; break;
case WXK_CONTROL: key = "CONTROL"; break; case WXK_CONTROL: key = "CONTROL"; break;
case WXK_MENU: key = "MENU"; break; case WXK_MENU: key = "MENU"; break;
case WXK_PAUSE: key = "PAUSE"; break; case WXK_PAUSE: key = "PAUSE"; break;
@@ -343,30 +344,30 @@ void MyTextCtrl::LogEvent(const char *name, wxKeyEvent& event) const
case WXK_NUMPAD_DECIMAL: key = "NUMPAD_DECIMAL"; break; case WXK_NUMPAD_DECIMAL: key = "NUMPAD_DECIMAL"; break;
default: default:
key.Printf("unknown (%ld)", keycode); key.Printf( _T("unknown (%ld)"), keycode);
} }
} }
wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"), wxLogMessage( _T("%s event: %s (flags = %c%c%c%c)"),
name, name,
key.c_str(), key.c_str(),
GetChar(event.ControlDown(), 'C'), GetChar( event.ControlDown(), _T('C') ),
GetChar(event.AltDown(), 'A'), GetChar( event.AltDown(), _T('A') ),
GetChar(event.ShiftDown(), 'S'), GetChar( event.ShiftDown(), _T('S') ),
GetChar(event.MetaDown(), 'M')); GetChar( event.MetaDown(), _T('M') ) );
} }
void MyTextCtrl::OnChar(wxKeyEvent& event) void MyTextCtrl::OnChar(wxKeyEvent& event)
{ {
LogEvent("Char", event); LogEvent( _T("Char"), event);
event.Skip(); event.Skip();
} }
void MyTextCtrl::OnKeyUp(wxKeyEvent& event) void MyTextCtrl::OnKeyUp(wxKeyEvent& event)
{ {
LogEvent("Key up", event); LogEvent( _("Key up"), event);
event.Skip(); event.Skip();
} }
@@ -405,7 +406,7 @@ void MyTextCtrl::OnKeyDown(wxKeyEvent& event)
break; break;
} }
LogEvent("Key down", event); LogEvent( _("Key down"), event);
event.Skip(); event.Skip();
} }

4
src/generic/progdlgg.cpp
View File

@@ -122,8 +122,8 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
bool bool
wxProgressDialog::Update(int value, const wxString& newmsg) wxProgressDialog::Update(int value, const wxString& newmsg)
{ {
wxASSERT_MSG( value == -1 || m_gauge, "can't update non existent dialog" ); wxASSERT_MSG( value == -1 || m_gauge, _T("can't update non existent dialog") );
wxASSERT_MSG( value < m_maximum, "invalid progress value" ); wxASSERT_MSG( value < m_maximum, _T("invalid progress value") );
if( m_gauge ) if( m_gauge )
m_gauge->SetValue(value + 1); m_gauge->SetValue(value + 1);

2
src/gtk/app.cpp
View File

@@ -213,7 +213,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
void wxapp_install_idle_handler() void wxapp_install_idle_handler()
{ {
wxASSERT_MSG( wxTheApp->m_idleTag == 0, "attempt to install idle handler twice" ); wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
/* this routine gets called by all event handlers /* this routine gets called by all event handlers
indicating that the idle is over. */ indicating that the idle is over. */

6
src/gtk/dcclient.cpp
View File

@@ -111,11 +111,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
m_owner = (wxWindow *)NULL; m_owner = (wxWindow *)NULL;
m_isMemDC = FALSE; m_isMemDC = FALSE;
wxASSERT_MSG( window, "DC needs a window" ); wxASSERT_MSG( window, _T("DC needs a window") );
GtkWidget *widget = window->m_wxwindow; GtkWidget *widget = window->m_wxwindow;
wxASSERT_MSG( widget, "DC needs a widget" ); wxASSERT_MSG( widget, _T("DC needs a widget") );
m_window = widget->window; m_window = widget->window;
@@ -1025,7 +1025,7 @@ void wxWindowDC::SetLogicalFunction( int function )
#endif #endif
default: default:
{ {
wxFAIL_MSG( "unsupported logical function" ); wxFAIL_MSG( _T("unsupported logical function") );
break; break;
} }
} }

6
src/gtk/window.cpp
View File

@@ -216,6 +216,12 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
case GDK_Shift_R: key_code = WXK_SHIFT; break; case GDK_Shift_R: key_code = WXK_SHIFT; break;
case GDK_Control_L: case GDK_Control_L:
case GDK_Control_R: key_code = WXK_CONTROL; break; case GDK_Control_R: key_code = WXK_CONTROL; break;
case GDK_Meta_L:
case GDK_Meta_R:
case GDK_Alt_L:
case GDK_Alt_R:
case GDK_Super_L:
case GDK_Super_R: key_code = WXK_ALT; break;
case GDK_Menu: key_code = WXK_MENU; break; case GDK_Menu: key_code = WXK_MENU; break;
case GDK_Help: key_code = WXK_HELP; break; case GDK_Help: key_code = WXK_HELP; break;
case GDK_BackSpace: key_code = WXK_BACK; break; case GDK_BackSpace: key_code = WXK_BACK; break;

2
src/gtk1/app.cpp
View File

@@ -213,7 +213,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
void wxapp_install_idle_handler() void wxapp_install_idle_handler()
{ {
wxASSERT_MSG( wxTheApp->m_idleTag == 0, "attempt to install idle handler twice" ); wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
/* this routine gets called by all event handlers /* this routine gets called by all event handlers
indicating that the idle is over. */ indicating that the idle is over. */

6
src/gtk1/dcclient.cpp
View File

@@ -111,11 +111,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
m_owner = (wxWindow *)NULL; m_owner = (wxWindow *)NULL;
m_isMemDC = FALSE; m_isMemDC = FALSE;
wxASSERT_MSG( window, "DC needs a window" ); wxASSERT_MSG( window, _T("DC needs a window") );
GtkWidget *widget = window->m_wxwindow; GtkWidget *widget = window->m_wxwindow;
wxASSERT_MSG( widget, "DC needs a widget" ); wxASSERT_MSG( widget, _T("DC needs a widget") );
m_window = widget->window; m_window = widget->window;
@@ -1025,7 +1025,7 @@ void wxWindowDC::SetLogicalFunction( int function )
#endif #endif
default: default:
{ {
wxFAIL_MSG( "unsupported logical function" ); wxFAIL_MSG( _T("unsupported logical function") );
break; break;
} }
} }

6
src/gtk1/window.cpp
View File

@@ -216,6 +216,12 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
case GDK_Shift_R: key_code = WXK_SHIFT; break; case GDK_Shift_R: key_code = WXK_SHIFT; break;
case GDK_Control_L: case GDK_Control_L:
case GDK_Control_R: key_code = WXK_CONTROL; break; case GDK_Control_R: key_code = WXK_CONTROL; break;
case GDK_Meta_L:
case GDK_Meta_R:
case GDK_Alt_L:
case GDK_Alt_R:
case GDK_Super_L:
case GDK_Super_R: key_code = WXK_ALT; break;
case GDK_Menu: key_code = WXK_MENU; break; case GDK_Menu: key_code = WXK_MENU; break;
case GDK_Help: key_code = WXK_HELP; break; case GDK_Help: key_code = WXK_HELP; break;
case GDK_BackSpace: key_code = WXK_BACK; break; case GDK_BackSpace: key_code = WXK_BACK; break;