projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove workaround
[wxWidgets.git]
/
src
/
msw
/
combo.cpp
diff --git
a/src/msw/combo.cpp
b/src/msw/combo.cpp
index a37257ae652f5ee4de9498cd2035c9bfb01aace4..f0c621d54df859c0d1453d1099afc8e113db3bae 100644
(file)
--- a/
src/msw/combo.cpp
+++ b/
src/msw/combo.cpp
@@
-117,9
+117,7
@@
#define NATIVE_TEXT_INDENT_XP 4
#define NATIVE_TEXT_INDENT_CLASSIC 2
#define NATIVE_TEXT_INDENT_XP 4
#define NATIVE_TEXT_INDENT_CLASSIC 2
-#define TEXTCTRLXADJUST_XP 1
#define TEXTCTRLYADJUST_XP 3
#define TEXTCTRLYADJUST_XP 3
-#define TEXTCTRLXADJUST_CLASSIC 1
#define TEXTCTRLYADJUST_CLASSIC 3
#define COMBOBOX_ANIMATION_RESOLUTION 10
#define TEXTCTRLYADJUST_CLASSIC 3
#define COMBOBOX_ANIMATION_RESOLUTION 10
@@
-252,7
+250,7
@@
void wxComboCtrl::OnThemeChange()
return;
}
return;
}
- wxLogApiError(
_
T("GetThemeColor(EDIT, ETS_NORMAL, TMT_FILLCOLOR)"), hr);
+ wxLogApiError(
wx
T("GetThemeColor(EDIT, ETS_NORMAL, TMT_FILLCOLOR)"), hr);
}
#endif
}
#endif
@@
-264,19
+262,16
@@
void wxComboCtrl::OnResize()
//
// Recalculates button and textctrl areas
//
// Recalculates button and textctrl areas
- int textCtrlXAdjust;
int textCtrlYAdjust;
#if wxUSE_UXTHEME
if ( wxUxThemeEngine::GetIfActive() )
{
int textCtrlYAdjust;
#if wxUSE_UXTHEME
if ( wxUxThemeEngine::GetIfActive() )
{
- textCtrlXAdjust = TEXTCTRLXADJUST_XP;
textCtrlYAdjust = TEXTCTRLYADJUST_XP;
}
else
#endif
{
textCtrlYAdjust = TEXTCTRLYADJUST_XP;
}
else
#endif
{
- textCtrlXAdjust = TEXTCTRLXADJUST_CLASSIC;
textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
}
textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC;
}
@@
-286,7
+281,7
@@
void wxComboCtrl::OnResize()
CalculateAreas(btnWidth);
// Position textctrl using standard routine
CalculateAreas(btnWidth);
// Position textctrl using standard routine
- PositionTextCtrl(
textCtrlXAdjust,
textCtrlYAdjust);
+ PositionTextCtrl(
0,
textCtrlYAdjust);
}
// Draws non-XP GUI dotted line around the focus area
}
// Draws non-XP GUI dotted line around the focus area