Corrected grey scrolling windows; added C++Builder 3.0 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
WXDIR = $(WXWIN)
|
||||
INCDIR = $(WXDIR)\include
|
||||
LIBDIR = $(WXDIR)\lib
|
||||
WXLIB = $(LIBDIR)\wx.lib
|
||||
|
||||
SRCSUFF = cpp
|
||||
OBJSUFF = obj
|
||||
@@ -14,8 +15,18 @@ INCLUDE=$(INCDIR)
|
||||
CC=sc
|
||||
RC=rc
|
||||
|
||||
# WIN16 settings
|
||||
#CFLAGS = -Jm -ml -W -D__WXMSW__ -D__WXDEBUG__ -D__WINDOWS__ -D__WIN16__ $(EXTRACPPFLAGS)
|
||||
#LDFLAGS = -ml -W
|
||||
#LINKER = link
|
||||
#LIBS=$(WXLIB) $(EXTRALIBS) libw.lib commdlg.lib ddeml.lib shell.lib
|
||||
#DEFFILE=sc16.def
|
||||
|
||||
# WIN32 settings
|
||||
CFLAGS = -o -mn -W -D__NT__ -DWIN32 -D__WIN32__ -D__WINDOWS__ -D__WXMSW__ -D__SC__ -D__WXDEBUG__ $(EXTRACPPFLAGS)
|
||||
LDFLAGS = $(EXTRALDFLAGS)
|
||||
LDFLAGS = -Llink386.exe $(EXTRALDFLAGS)
|
||||
LINKER = link386
|
||||
LIBS=$(WXLIB) $(EXTRALIBS) ctl3d32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib kernel32.lib winmm.lib
|
||||
|
||||
.$(SRCSUFF).obj:
|
||||
*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $< -o$@
|
||||
@@ -24,3 +35,6 @@ LDFLAGS = $(EXTRALDFLAGS)
|
||||
.c.obj:
|
||||
*$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) -DUSE_DEFINE -Jm $< -o$@
|
||||
|
||||
.rc.res:
|
||||
*$(RC) -r -I$(INCLUDE) $<
|
||||
|
||||
|
@@ -246,3 +246,4 @@ $(COMMDIR)\lex_yy.c: $(COMMDIR)\doslex.c
|
||||
|
||||
#$(COMMDIR)\cmndata.obj: $(COMMDIR)\cmndata.cpp
|
||||
# *$(CC) -c $(CFLAGS) -I$(INCLUDE) $(OPTIONS) $(COMMDIR)\cmndata.cpp -o$(COMMDIR)\cmndata.obj
|
||||
|
||||
|
@@ -747,7 +747,7 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
|
||||
// or when "endl" is output (Borland 4.5)
|
||||
//=========================================================================
|
||||
// Class declaration using multiple inheritance doesn't work properly for
|
||||
// Borland. See note in wb_text.h.
|
||||
// Borland. See note in textctrl.h.
|
||||
#ifndef NO_TEXT_WINDOW_STREAM
|
||||
int wxTextCtrl::overflow(int c)
|
||||
{
|
||||
|
Reference in New Issue
Block a user