projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix history in wxWebViewIE when using a custom file scheme.
[wxWidgets.git]
/
src
/
gtk1
/
control.cpp
diff --git
a/src/gtk1/control.cpp
b/src/gtk1/control.cpp
index f0c279a7f0be6b8d8f20cc43c0fe7d9abd0b26a8..42167081751742301fb32e1527de94ee3b9f6059 100644
(file)
--- a/
src/gtk1/control.cpp
+++ b/
src/gtk1/control.cpp
@@
-83,7
+83,7
@@
void wxControl::PostCreation(const wxSize& size)
gtk_widget_ensure_style(m_widget);
ApplyWidgetStyle();
gtk_widget_ensure_style(m_widget);
ApplyWidgetStyle();
- SetInitial
Best
Size(size);
+ SetInitialSize(size);
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-120,7
+120,7
@@
void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
const wxString labelGTK = GTKRemoveMnemonics(label);
const wxString labelGTK = GTKRemoveMnemonics(label);
- gtk_frame_set_label(w, labelGTK.empty() ? (char *)NULL
+ gtk_frame_set_label(w, labelGTK.empty() ? (c
onst c
har *)NULL
: wxGTK_CONV(labelGTK));
}
: wxGTK_CONV(labelGTK));
}
@@
-134,7
+134,7
@@
wxString wxControl::GTKRemoveMnemonics(const wxString& label)
{
wxChar ch = label[i];
{
wxChar ch = label[i];
- if ( ch ==
_
T('&') )
+ if ( ch ==
wx
T('&') )
{
if ( i == len - 1 )
{
{
if ( i == len - 1 )
{
@@
-144,7
+144,7
@@
wxString wxControl::GTKRemoveMnemonics(const wxString& label)
}
ch = label[++i]; // skip '&' itself
}
ch = label[++i]; // skip '&' itself
- if ( ch ==
_
T('&') )
+ if ( ch ==
wx
T('&') )
{
// special case: "&&" is not a mnemonic at all but just an
// escaped "&"
{
// special case: "&&" is not a mnemonic at all but just an
// escaped "&"