X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/170acdc90e9f92f8b8120fa6c04acdbf45c89582..6aacfc7320dd6e5e145848b4f25630d675f8fb10:/src/gtk1/control.cpp?ds=sidebyside diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index e41fdb9cbe..4216708175 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -120,7 +120,7 @@ void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) const wxString labelGTK = GTKRemoveMnemonics(label); - gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL + gtk_frame_set_label(w, labelGTK.empty() ? (const char *)NULL : wxGTK_CONV(labelGTK)); } @@ -134,7 +134,7 @@ wxString wxControl::GTKRemoveMnemonics(const wxString& label) { wxChar ch = label[i]; - if ( ch == _T('&') ) + if ( ch == wxT('&') ) { if ( i == len - 1 ) { @@ -144,7 +144,7 @@ wxString wxControl::GTKRemoveMnemonics(const wxString& label) } ch = label[++i]; // skip '&' itself - if ( ch == _T('&') ) + if ( ch == wxT('&') ) { // special case: "&&" is not a mnemonic at all but just an // escaped "&"