X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9cb80f3fa331228864ebc13188a0168da36a4998..13b4df952c77383f50696e51fcbaa2d8bbd3b3b9:/src/msw/combo.cpp?ds=sidebyside diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp index 1e59def4d8..12db6bf584 100644 --- a/src/msw/combo.cpp +++ b/src/msw/combo.cpp @@ -117,9 +117,6 @@ #define NATIVE_TEXT_INDENT_XP 4 #define NATIVE_TEXT_INDENT_CLASSIC 2 -#define TEXTCTRLYADJUST_XP 3 -#define TEXTCTRLYADJUST_CLASSIC 3 - #define COMBOBOX_ANIMATION_RESOLUTION 10 #define COMBOBOX_ANIMATION_DURATION 200 // In milliseconds @@ -229,26 +226,13 @@ void wxComboCtrl::OnResize() // // Recalculates button and textctrl areas - int textCtrlYAdjust; - -#if wxUSE_UXTHEME - if ( wxUxThemeEngine::GetIfActive() ) - { - textCtrlYAdjust = TEXTCTRLYADJUST_XP; - } - else -#endif - { - textCtrlYAdjust = TEXTCTRLYADJUST_CLASSIC; - } - // Technically Classic Windows style combo has more narrow button, // but the native renderer doesn't paint it well like that. int btnWidth = 17; CalculateAreas(btnWidth); // Position textctrl using standard routine - PositionTextCtrl(0, textCtrlYAdjust); + PositionTextCtrl(); } // Draws non-XP GUI dotted line around the focus area