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

Support encodings in wxGTK_CONV_BACK() in the same way as we do it in

Browse Source 
wxGTK_CONV(), i.e. return the string containing text in ISO-8859-1 encoding
and not UTF-8 if the controls font was set to have ISO-8859-1 encoding


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-27 15:41:56 +00:00
parent c0da0dbabf
commit 30083ad8e7
7 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gtk/window.cpp
View File

@@ -1158,7 +1158,7 @@ gtk_wxwindow_commit_cb (GtkIMContext *context,
window, window->m_imData->lastKeyEvent);
}
const wxWxCharBuffer data(wxGTK_CONV_BACK(str));
const wxWxCharBuffer data(wxGTK_CONV_BACK_SYS(str));
if( !data )
return;
@@ -2137,16 +2137,11 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
if ((client_width == win->m_oldClientWidth) && (client_height == win->m_oldClientHeight))
return;
#if 0
wxPrintf( wxT("size_allocate ") );
if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
wxPrintf( win->GetClassInfo()->GetClassName() );
wxPrintf( wxT(" %d %d %d %d\n"),
alloc->x,
alloc->y,
alloc->width,
alloc->height );
#endif
if ( !client_width && !client_height )
{
// the window is currently unmapped, don't generate size events
return;
}
win->m_oldClientWidth = client_width;
win->m_oldClientHeight = client_height;