diff options
| -rw-r--r-- | win32/PlatWin.cxx | 4 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 2 | ||||
| -rw-r--r-- | win32/makefile | 2 | ||||
| -rw-r--r-- | win32/makefile_vc | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index f1c521521..bea215566 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -706,8 +706,8 @@ ListBox::~ListBox() { void ListBox::Create(Window &parent, int ctrlID) { id = ::CreateWindowEx( - WS_EX_CLIENTEDGE, "listbox", "", - WS_CHILD|WS_BORDER|WS_VSCROLL|LBS_SORT|LBS_NOTIFY, + WS_EX_WINDOWEDGE, "listbox", "", + WS_CHILD | WS_THICKFRAME | WS_VSCROLL | LBS_SORT | LBS_NOTIFY, 100,100, 150,80, parent.GetID(), reinterpret_cast<HMENU>(ctrlID), parent.GetInstance(), 0); } diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 9a964161e..0a7c18e2f 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -1421,8 +1421,6 @@ static BOOL IsNT() { void ScintillaWin::Register(HINSTANCE hInstance_) { hInstance = hInstance_; - - InitCommonControls(); #if 0 // Register the Scintilla class if (IsNT()) { diff --git a/win32/makefile b/win32/makefile index c1f71fa1c..c52aa2ffb 100644 --- a/win32/makefile +++ b/win32/makefile @@ -14,7 +14,7 @@ LEXCOMPONENT = ../bin/SciLexer.dll vpath %.h ../src ../include vpath %.cxx ../src -LDFLAGS = -lkernel32 -lgdi32 -luser32 -lcomdlg32 -lcomctl32 -limm32 -lole32 -luuid +LDFLAGS = -lkernel32 -luser32 -lgdi32 -limm32 -lole32 -luuid # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src diff --git a/win32/makefile_vc b/win32/makefile_vc index 4f94c6bcd..ce831c6b6 100644 --- a/win32/makefile_vc +++ b/win32/makefile_vc @@ -15,7 +15,7 @@ DIR_BIN=..\bin COMPONENT = $(DIR_BIN)\Scintilla.dll LEXCOMPONENT = $(DIR_BIN)\SciLexer.dll -LDFLAGS = KERNEL32.lib USER32.lib GDI32.lib COMDLG32.lib COMCTL32.lib ADVAPI32.lib IMM32.lib SHELL32.LIB OLE32.LIB +LDFLAGS = KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB INCLUDEDIRS=-I ../include -I ../src CXXFLAGS = /TP /W4 |