Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added more makefiles; fixed some samples for Cygwin

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-02-09 16:00:23 +00:00
parent fed485e094
commit dbda9e86f0
84 changed files with 1997 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1736
src/common/image.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/common/string.cpp
View File

@@ -110,6 +110,10 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
#warning "Using sprintf() because no snprintf()-like function defined"
#elif defined(__MWERKS__)
#warning "Using sprintf() because no snprintf()-like function defined"
#elif defined(__WATCOMC__)
// No warning
#elif defined(__BORLANDC__)
// No warning
#elif defined(__SUNCC__)
// nothing -- I don't know about "#warning" for Sun's CC
#else

4
src/makeb32.env
View File

@@ -50,10 +50,10 @@ WXLIB= $(WXLIBDIR)\wx32.lib
!if "$(WXBUILDDLL)" == "1"
DLL_FLAGS= $(DLL_FLAGS) -D_RTLDLL
LINK_FLAGS= /Tpd /ap /c
LINK_FLAGS= /Tpd /ap /c $(EXTRALINKFLAGS)
!endif
CPPFLAGS=$(DLL_FLAGS) @$(CFG)
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
DUMMY=dummy

8
src/makebcc.env
View File

@@ -11,18 +11,16 @@ FINAL=0
!endif
!if "$(FINAL)" == "0"
LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS= -v -D__WXDEBUG__
!else
LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib
LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS)
OPT = -O2
DEBUG_FLAGS =
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) $(EXTRACPPFLAGS) @$(CFG)
WXLIB= $(WXLIBDIR)\wx.lib
SRCSUFF = cpp

20
src/makeg95.env
View File

@@ -121,11 +121,11 @@ WXSRC=$(WXDIR)/src/msw
WXINC=$(WXDIR)/include
WXBASESRC=$(WXDIR)/src/common
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC)$(COMPPATHS)
INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
#LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS)
LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS)
WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)
@@ -135,13 +135,13 @@ XLIB=$(LIBS)
LDLIBS = $(LIBS)
# Directory for object files (don't change)
OBJDIR = objects$(GUISUFFIX)
# OBJDIR = objects$(GUISUFFIX)
# You shouldn't need to change these...
CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT)
CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACPPFLAGS)
CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRACFLAGS)
WINDOWSLDFLAGS=-Wl,--subsystem,windows -mwindows
LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib
LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
@@ -150,11 +150,11 @@ LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib
# CPLUS_INCLUDE_PATH=/usr/H-i386-cygwin32/i386-cygwin32/include:/usr/H-i386-cygwin32/lib/gcc-lib/i386-cygwin32/cygnus-2.7.2-961023/include:$(WXDIR)/include/common:$(WXDIR)/include/msw:$(WXDIR)/contrib/fafa:$(WXDIR)/contrib/itsybits; \
# export CPLUS_INCLUDE_PATH RCINCLUDE; \
.rc.$(RESSUFF): $< $(WXDIR)/include/msw/wx.rc
$(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS)
#.rc.$(RESSUFF): $< $(WXDIR)/include/msw/wx.rc
# $(RC) $(RESFLAGS1) $< $(RESFLAGS2) $*.$(RESSUFF) $(RCLFLAGS)
.$(RESSUFF).$(RSCSUFF): $<
$(CVTRES) $< $*.$(RSCSUFF)
#.$(RESSUFF).$(RSCSUFF): $<
# $(CVTRES) $< $*.$(RSCSUFF)
.$(SRCSUFF).$(OBJSUFF):
$(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)

37
src/makelib.b32 Normal file
View File

@@ -0,0 +1,37 @@
#
# File: makelib.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Include file for libraries. Set LIBTARGET and OBJECTS
# before including this file.
# WXWIN and BCCDIR are set by parent make
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
$(LIBTARGET): $(OBJECTS)
erase $(LIBTARGET)
tlib $(LIBTARGET) /P512 @&&!
-+$(OBJECTS:.obj =.obj -+)
!
.$(SRCSUFF).obj:
bcc32 $(CPPFLAGS) -c {$< }
.c.obj:
bcc32 $(CPPFLAGS) -P- -c {$< }
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.rws
-erase $(LIBTARGET)

37
src/makelib.bcc Normal file
View File

@@ -0,0 +1,37 @@
#
# File: makelib.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Include file for libraries. Set LIBTARGET and OBJECTS
# before including this file.
# WXWIN and BCCDIR are set by parent make
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makebcc.env
$(LIBTARGET): $(OBJECTS)
erase $(LIBTARGET)
tlib $(LIBTARGET) /P1024 @&&!
-+$(OBJECTS:.obj =.obj -+)
!
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) -c {$< }
.c.obj:
bcc $(CPPFLAGS) -P- -c {$< }
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.rws
-erase $(LIBTARGET)

23
src/makelib.g95 Normal file
View File

@@ -0,0 +1,23 @@
#
# File: makelib.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Include file for Cygwin/Mingw32 libraries
WXDIR = $(WXWIN)
# All common UNIX compiler flags and options are now in
# this central makefile.
include $(WXDIR)/src/makeg95.env
all: $(LIBTARGET) $(EXTRATARGETS)
$(LIBTARGET): $(OBJECTS)
ar $(AROPTIONS) $@ $(OBJECTS)
$(RANLIB) $@
clean:
rm -f $(OBJECTS) $(LIBTARGET) core *.rsc *.res

26
src/makelib.wat Normal file
View File

@@ -0,0 +1,26 @@
WXDIR = $(%WXWIN)
!include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib
LNK = tmp.lbc
all: $(LIBTARGET)
$(LIBTARGET) : $(OBJECTS)
%create tmp.lbc
@for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
wlib /b /c /n /p=512 $^@ @tmp.lbc
clean: .SYMBOLIC
-erase *.obj
-erase *.bak
-erase *.err
-erase *.pch
-erase *.lib
-erase *.lbc
-erase *.res
-erase *.exe
-erase *.lbc
-erase $(LIBTARGET)

11
src/makeprog.b32
View File

@@ -13,18 +13,21 @@
WXDIR = $(WXWIN)
!include $(WXDIR)\src\makeb32.env
LIBS=$(WXLIB) cw32mt import32 ole2w32
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32
!if "$(FINAL)" == "0"
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS= -v
!else
LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib $(EXTRALINKFLAGS)
OPT = -Od
DEBUG_FLAGS =
!endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
CPPFLAGS=$(DEBUG_FLAGS) $(EXTRACPPFLAGS) $(OPT) @$(CFG)
all: $(TARGET).exe $(EXTRATARGETS)
$(TARGET).exe: $(OBJECTS) $(TARGET).res
tlink32 $(LINKFLAGS) @&&!

7
src/makeprog.bcc
View File

@@ -4,9 +4,9 @@
!include $(WXDIR)\src\makebcc.env
WXLIB = $(WXDIR)\lib\wx.lib
LIBS=$(WXLIB) mathwl cwl import ole2w16
LIBS=$(WXLIB) $(EXTRALIBS) mathwl cwl import ole2w16
all: $(TARGET).exe
all: $(TARGET).exe $(EXTRATARGETS)
$(TARGET).exe: $(WXLIB) $(OBJECTS) $(TARGET).def $(TARGET).res
tlink $(LINKFLAGS) @&&!
@@ -21,6 +21,9 @@ $(TARGET).def
.$(SRCSUFF).obj:
bcc $(CPPFLAGS) -c {$< }
.c.obj:
bcc $(CPPFLAGS) -P- -c {$< }
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
brc -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)

23
src/makeprog.g95 Normal file
View File

@@ -0,0 +1,23 @@
#
# File: makeprog.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Include file for Cygwin/Mingw32 samples
WXDIR = $(WXWIN)
include $(WXDIR)/src/makeg95.env
all: $(TARGET)$(GUISUFFIX)$(EXESUFF) $(TARGET)_resources.$(OBJSUFF) $(EXTRATARGETS)
$(TARGET)$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(WXLIB)
$(CC) $(LDFLAGS) -o $(TARGET)$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(TARGET)_resources.$(OBJSUFF) $(LDLIBS)
$(TARGET)_resources.o: $(TARGET).rc
$(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
clean:
rm -f $(OBJECTS) $(TARGET)_resources.o $(TARGET).exe core *.rsc *.res

4
src/makeprog.wat
View File

@@ -5,7 +5,7 @@ WXDIR = $(%WXWIN)
WXLIB = $(WXDIR)\lib
LNK = $(PROGRAM).lnk
all: $(PROGRAM).exe
all: $(PROGRAM).exe $(EXTRATARGETS)
$(PROGRAM).exe : $(OBJECTS) $(PROGRAM).res $(LNK) $(WXLIB)\wx.lib
wlink @$(LNK)
@@ -20,7 +20,7 @@ $(LNK) : makefile.wat
@%append $(LNK) system $(LINKOPTION)
@%append $(LNK) $(STACK)
@%append $(LNK) name $(PROGRAM).exe
@%append $(LNK) file $(WXLIB)\wx.lib
@for %i in ($(LIBS)) do @%append $(LNK) file %i
@for %i in ($(EXTRALIBS)) do @%append $(LNK) file %i
@for %i in ($(OBJECTS)) do @%append $(LNK) file %i
# @%append $(LNK) $(MINDATA)

2
src/makewat.env
View File

@@ -51,7 +51,7 @@ WATLIBDIR = $(WATCOMDIR)\lib386\nt
MINDATA =
MAXDATA =
STACK = option stack=64k
EXTRALIBS = $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
LIBS = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib &
$(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib &
$(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib &
$(WATLIBDIR)\uuid.lib # $(WATLIBDIR)\odbc32.lib

1
src/msw/clipbrd.cpp
View File

@@ -47,6 +47,7 @@
#include "wx/metafile.h"
#endif
#include "wx/log.h"
#include "wx/clipbrd.h"
#include <windows.h>

1
src/msw/dialog.cpp
View File

@@ -29,6 +29,7 @@
#endif
#include "wx/msw/private.h"
#include "wx/log.h"
#if wxUSE_COMMON_DIALOGS
#include <commdlg.h>

15
src/msw/makefile.g95
View File

@@ -51,11 +51,6 @@ XPMDIR=../xpm
OLEDIR=ole
MSWDIR=.
GENERICOBJDIR=../generic/$(OBJDIR)
COMMOBJDIR=../common/$(OBJDIR)
OLEOBJDIR=ole/$(OBJDIR)
MSWDIR=$(OBJDIR)
DOCDIR = $(WXDIR)\docs
GENERICOBJS= \
@@ -95,6 +90,7 @@ COMMONOBJS = \
$(COMMDIR)/helpbase.$(OBJSUFF) \
$(COMMDIR)/image.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
$(COMMDIR)/ipcbase.$(OBJSUFF) \
$(COMMDIR)/layout.$(OBJSUFF) \
$(COMMDIR)/log.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \
@@ -263,15 +259,6 @@ $(WXLIB): $(OBJECTS) $(EXTRAOBJS)
ar $(AROPTIONS) $@ $(EXTRAOBJS) $(OBJECTS)
$(RANLIB) $@
#$(MSWOBJDIR):
# mkdir $(OBJDIR)
#$(COMMOBJDIR):
# mkdir $(COMMDIR)/$(OBJDIR)
#$(GENERICOBJDIR):
# mkdir $(GENDIR)/$(OBJDIR)
$(OBJECTS): $(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
$(COMMDIR)/y_tab.$(OBJSUFF): $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c

1
src/msw/makefile.twn
View File

@@ -92,6 +92,7 @@ COMMONOBJS = \
$(COMMDIR)/helpbase.$(OBJSUFF) \
$(COMMDIR)/image.$(OBJSUFF) \
$(COMMDIR)/intl.$(OBJSUFF) \
$(COMMDIR)/ipcbase.$(OBJSUFF) \
$(COMMDIR)/layout.$(OBJSUFF) \
$(COMMDIR)/log.$(OBJSUFF) \
$(COMMDIR)/memory.$(OBJSUFF) \

73
src/msw/window.cpp
View File

@@ -50,6 +50,8 @@
#include "wx/menuitem.h"
#include "wx/log.h"
#include "wx/tooltip.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/msw/private.h"
@@ -1223,10 +1225,19 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
}
case WM_KEYDOWN:
MSWOnKeyDown((WORD) wParam, lParam);
// we consider these message "not interesting"
{
// If this has been processed by an event handler,
// return 0 now (we've handled it).
if (MSWOnKeyDown((WORD) wParam, lParam))
{
return 0;
}
// we consider these message "not interesting" to OnChar
if ( wParam == VK_SHIFT || wParam == VK_CONTROL )
{
return Default();
}
// Avoid duplicate messages to OnChar for these special keys
switch ( wParam )
@@ -1240,27 +1251,36 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
case VK_RIGHT:
case VK_DOWN:
case VK_UP:
if ( ::GetKeyState(VK_CONTROL) & 0x100 )
MSWOnChar((WORD)wParam, lParam);
/*
// if ( ::GetKeyState(VK_CONTROL) & 0x100 ) // Don't understand purpose of this test
if (!MSWOnChar((WORD)wParam, lParam))
return Default();
break;
*/
default:
MSWOnChar((WORD)wParam, lParam);
if (!MSWOnChar((WORD)wParam, lParam))
{
return Default();
}
/*
if ( ::GetKeyState(VK_CONTROL) & 0x100 )
return Default();
*/
break;
}
break;
}
case WM_KEYUP:
{
MSWOnKeyUp((WORD) wParam, lParam);
if (!MSWOnKeyUp((WORD) wParam, lParam))
return Default();
break;
}
case WM_CHAR: // Always an ASCII character
{
MSWOnChar((WORD)wParam, lParam, TRUE);
if (!MSWOnChar((WORD)wParam, lParam, TRUE))
return Default();
break;
}
@@ -2456,7 +2476,7 @@ void wxWindow::MSWOnMouseLeave(int x, int y, WXUINT flags)
GetEventHandler()->ProcessEvent(event);
}
void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
bool wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
{
int id;
bool tempControlDown = FALSE;
@@ -2518,12 +2538,16 @@ void wxWindow::MSWOnChar(WXWORD wParam, WXLPARAM lParam, bool isASCII)
event.m_x = pt.x; event.m_y = pt.y;
if (!GetEventHandler()->ProcessEvent(event))
Default();
if (GetEventHandler()->ProcessEvent(event))
return TRUE;
else
return FALSE;
}
else
return FALSE;
}
void wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII)
bool wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII)
{
int id;
@@ -2552,12 +2576,19 @@ void wxWindow::MSWOnKeyDown(WXWORD wParam, WXLPARAM lParam, bool isASCII)
event.m_x = pt.x; event.m_y = pt.y;
if (!GetEventHandler()->ProcessEvent(event))
Default();
if (GetEventHandler()->ProcessEvent(event))
{
return TRUE;
}
else return FALSE;
}
else
{
return FALSE;
}
}
void wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII)
bool wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII)
{
int id;
@@ -2586,9 +2617,13 @@ void wxWindow::MSWOnKeyUp(WXWORD wParam, WXLPARAM lParam, bool isASCII)
event.m_x = pt.x; event.m_y = pt.y;
if (!GetEventHandler()->ProcessEvent(event))
Default();
if (GetEventHandler()->ProcessEvent(event))
return TRUE;
else
return FALSE;
}
else
return FALSE;
}
void wxWindow::MSWOnJoyDown(int joystick, int x, int y, WXUINT flags)
@@ -3666,7 +3701,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
if ( id == -1 )
id= m_lastWParam;
if ( !event.ControlDown() )
if ( !event.ControlDown() ) // Why this test?
(void) MSWDefWindowProc(m_lastMsg, (WPARAM) id, m_lastLParam);
}