Added fixes for Unicode compilation.
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:
@@ -213,7 +213,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
|
||||
|
||||
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
|
||||
indicating that the idle is over. */
|
||||
|
@@ -111,11 +111,11 @@ wxWindowDC::wxWindowDC( wxWindow *window )
|
||||
m_owner = (wxWindow *)NULL;
|
||||
m_isMemDC = FALSE;
|
||||
|
||||
wxASSERT_MSG( window, "DC needs a window" );
|
||||
wxASSERT_MSG( window, _T("DC needs a window") );
|
||||
|
||||
GtkWidget *widget = window->m_wxwindow;
|
||||
|
||||
wxASSERT_MSG( widget, "DC needs a widget" );
|
||||
wxASSERT_MSG( widget, _T("DC needs a widget") );
|
||||
|
||||
m_window = widget->window;
|
||||
|
||||
@@ -1025,7 +1025,7 @@ void wxWindowDC::SetLogicalFunction( int function )
|
||||
#endif
|
||||
default:
|
||||
{
|
||||
wxFAIL_MSG( "unsupported logical function" );
|
||||
wxFAIL_MSG( _T("unsupported logical function") );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@@ -216,6 +216,12 @@ static long map_to_unmodified_wx_keysym( KeySym keysym )
|
||||
case GDK_Shift_R: key_code = WXK_SHIFT; break;
|
||||
case GDK_Control_L:
|
||||
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_Help: key_code = WXK_HELP; break;
|
||||
case GDK_BackSpace: key_code = WXK_BACK; break;
|
||||
|
Reference in New Issue
Block a user