Changed name of controls sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -10,11 +10,11 @@ RULE=bin
|
||||
BIN_TARGET=test
|
||||
# define library sources
|
||||
BIN_SRC=\
|
||||
minimal.cpp
|
||||
controls.cpp
|
||||
|
||||
#define library objects
|
||||
BIN_OBJ=\
|
||||
minimal.o
|
||||
controls.o
|
||||
|
||||
# additional things needed to link
|
||||
BIN_LINK=
|
||||
|
||||
@@ -199,6 +199,7 @@ void MyPanel::OnListBox( wxCommandEvent &event )
|
||||
|
||||
void MyPanel::OnListBoxButtons( wxCommandEvent &WXUNUSED(event) )
|
||||
{
|
||||
if (m_notebook->GetPageCount() > 1)
|
||||
m_notebook->DeletePage( 1 );
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds minimal example (DOS).
|
||||
# Makefile : Builds controls example (DOS).
|
||||
|
||||
# WXWIN and BCCDIR are set by parent make
|
||||
|
||||
@@ -19,7 +19,7 @@ WXINC = $(WXDIR)\include\msw
|
||||
WXLIB = $(WXLIBDIR)\wx32.lib
|
||||
LIBS=$(WXLIB) cw32 import32 ole2w32
|
||||
|
||||
TARGET=minimal
|
||||
TARGET=controls
|
||||
|
||||
!if "$(FINAL)" == "0"
|
||||
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
|
||||
@@ -32,7 +32,7 @@ DEBUG_FLAGS =
|
||||
!endif
|
||||
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
|
||||
|
||||
OBJECTS = minimal.obj
|
||||
OBJECTS = controls.obj
|
||||
|
||||
$(TARGET).exe: $(OBJECTS) $(TARGET).def $(TARGET).res
|
||||
tlink32 $(LINKFLAGS) @&&!
|
||||
@@ -50,7 +50,7 @@ $(TARGET).def
|
||||
.c.obj:
|
||||
bcc32 $(CPPFLAGS) -P- -c {$< }
|
||||
|
||||
minimal.obj: minimal.$(SRCSUFF)
|
||||
controls.obj: controls.$(SRCSUFF)
|
||||
|
||||
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
|
||||
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds minimal example (DOS).
|
||||
# Makefile : Builds controls example (DOS).
|
||||
|
||||
!if "$(BCCDIR)" == ""
|
||||
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
|
||||
@@ -20,7 +20,7 @@
|
||||
WXDIR = $(WXWIN)
|
||||
!include $(WXDIR)\src\makebcc.env
|
||||
|
||||
THISDIR = $(WXDIR)\samples\minimal
|
||||
THISDIR = $(WXDIR)\samples\controls
|
||||
WXLIB = $(WXDIR)\lib\wx.lib
|
||||
LIBS=$(WXLIB) mathwl cwl import
|
||||
INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
|
||||
@@ -41,29 +41,29 @@ DEBUG_FLAGS=
|
||||
!endif
|
||||
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
|
||||
|
||||
OBJECTS = minimal.obj
|
||||
OBJECTS = controls.obj
|
||||
|
||||
minimal: minimal.exe
|
||||
controls: controls.exe
|
||||
|
||||
all: minimal.exe
|
||||
all: controls.exe
|
||||
|
||||
minimal.exe: $(WXLIB) minimal.obj minimal.def minimal.res
|
||||
controls.exe: $(WXLIB) controls.obj controls.def controls.res
|
||||
tlink $(LINKFLAGS) @&&!
|
||||
c0wl.obj minimal.obj
|
||||
minimal
|
||||
c0wl.obj controls.obj
|
||||
controls
|
||||
nul
|
||||
$(LIBS)
|
||||
minimal.def
|
||||
controls.def
|
||||
!
|
||||
rc -31 -K minimal.res
|
||||
rc -31 -K controls.res
|
||||
|
||||
.$(SRCSUFF).obj:
|
||||
bcc $(CPPFLAGS) -c {$< }
|
||||
|
||||
minimal.obj: minimal.$(SRCSUFF)
|
||||
controls.obj: controls.$(SRCSUFF)
|
||||
|
||||
minimal.res : minimal.rc $(WXDIR)\include\msw\wx.rc
|
||||
rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal
|
||||
controls.res : controls.rc $(WXDIR)\include\msw\wx.rc
|
||||
rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa controls
|
||||
|
||||
clean:
|
||||
-erase *.obj
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds minimal example (DOS).
|
||||
# Makefile : Builds controls example (DOS).
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info
|
||||
|
||||
@@ -15,17 +15,17 @@ WXDIR = $(WXWIN)
|
||||
|
||||
!include $(WXDIR)\src\makemsc.env
|
||||
|
||||
THISDIR = $(WXDIR)\samples\minimal
|
||||
THISDIR = $(WXDIR)\samples\controls
|
||||
|
||||
!ifndef FINAL
|
||||
FINAL=0
|
||||
!endif
|
||||
|
||||
HEADERS =
|
||||
SOURCES = minimal.$(SRCSUFF)
|
||||
OBJECTS = minimal.obj
|
||||
SOURCES = controls.$(SRCSUFF)
|
||||
OBJECTS = controls.obj
|
||||
|
||||
all: minimal.exe
|
||||
all: controls.exe
|
||||
|
||||
wx:
|
||||
cd $(WXDIR)\src\msw
|
||||
@@ -37,24 +37,24 @@ wxclean:
|
||||
nmake -f makefile.dos clean
|
||||
cd $(THISDIR)
|
||||
|
||||
minimal.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) minimal.obj minimal.def minimal.res
|
||||
controls.exe: $(WXDIR)\src\msw\dummy.obj $(WXLIB) controls.obj controls.def controls.res
|
||||
link $(LINKFLAGS) @<<
|
||||
minimal.obj $(WXDIR)\src\msw\dummy.obj,
|
||||
minimal,
|
||||
controls.obj $(WXDIR)\src\msw\dummy.obj,
|
||||
controls,
|
||||
NUL,
|
||||
$(LIBS),
|
||||
minimal.def
|
||||
controls.def
|
||||
;
|
||||
<<
|
||||
rc -K minimal.res
|
||||
rc -K controls.res
|
||||
|
||||
minimal.obj: minimal.$(SRCSUFF)
|
||||
controls.obj: controls.$(SRCSUFF)
|
||||
cl @<<
|
||||
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
|
||||
<<
|
||||
|
||||
minimal.res : minimal.rc $(WXDIR)\include\wx\msw\wx.rc
|
||||
rc -r /i$(WXDIR)\include minimal
|
||||
controls.res : controls.rc $(WXDIR)\include\wx\msw\wx.rc
|
||||
rc -r /i$(WXDIR)\include controls
|
||||
|
||||
clean:
|
||||
-erase *.obj
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for minimal example (UNIX).
|
||||
# Makefile for controls example (UNIX).
|
||||
|
||||
WXDIR = ../..
|
||||
|
||||
@@ -15,23 +15,23 @@ WXDIR = ../..
|
||||
# this central makefile.
|
||||
include $(WXDIR)/src/makeg95.env
|
||||
|
||||
OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF) $(OBJDIR)/minimal_resources.$(OBJSUFF)
|
||||
OBJECTS = $(OBJDIR)/controls.$(OBJSUFF) $(OBJDIR)/controls_resources.$(OBJSUFF)
|
||||
|
||||
all: $(OBJDIR) minimal$(GUISUFFIX)$(EXESUFF)
|
||||
all: $(OBJDIR) controls$(GUISUFFIX)$(EXESUFF)
|
||||
|
||||
wx:
|
||||
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
minimal$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
|
||||
controls$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o controls$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
|
||||
|
||||
$(OBJDIR)/minimal.$(OBJSUFF): minimal.$(SRCSUFF)
|
||||
$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
|
||||
$(OBJDIR)/controls.$(OBJSUFF): controls.$(SRCSUFF)
|
||||
$(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/minimal_resources.o: minimal.rc
|
||||
$(RESCOMP) -i minimal.rc -o $(OBJDIR)/minimal_resources.o $(RESFLAGS)
|
||||
$(OBJDIR)/controls_resources.o: controls.rc
|
||||
$(RESCOMP) -i controls.rc -o $(OBJDIR)/controls_resources.o $(RESFLAGS)
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) minimal$(GUISUFFIX).exe core *.rsc *.res
|
||||
rm -f $(OBJECTS) controls$(GUISUFFIX).exe core *.rsc *.res
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile : Builds minimal example (MS VC++).
|
||||
# Makefile : Builds controls example (MS VC++).
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info
|
||||
|
||||
@@ -18,8 +18,8 @@ WXUSINGDLL=0
|
||||
|
||||
!include $(WXDIR)\src\ntwxwin.mak
|
||||
|
||||
THISDIR = $(WXDIR)\samples\minimal
|
||||
PROGRAM=minimal
|
||||
THISDIR = $(WXDIR)\samples\controls
|
||||
PROGRAM=controls
|
||||
|
||||
OBJECTS = $(PROGRAM).obj
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
# Symantec C++ makefile for minimal example
|
||||
; Last change: JS 10 Jul 98 11:33 am
|
||||
# Symantec C++ makefile for controls example
|
||||
# NOTE that peripheral libraries are now dealt in main wxWindows makefile.
|
||||
|
||||
WXDIR = $(WXWIN)
|
||||
@@ -24,7 +25,7 @@ LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
|
||||
.rc.res:
|
||||
*$(RC) -r -I$(INCLUDE) $<
|
||||
|
||||
minimal.exe: minimal.obj minimal.def minimal.res
|
||||
controls.exe: controls.obj controls.def controls.res
|
||||
*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
|
||||
|
||||
clean:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for minimal example (UNIX).
|
||||
# Makefile for controls example (UNIX).
|
||||
|
||||
WXDIR = ../..
|
||||
|
||||
@@ -15,11 +15,11 @@ WXDIR = ../..
|
||||
# this central makefile.
|
||||
include $(WXDIR)/src/make.env
|
||||
|
||||
OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF)
|
||||
OBJECTS = $(OBJDIR)/controls.$(OBJSUFF)
|
||||
|
||||
.SUFFIXES:
|
||||
|
||||
all: $(OBJDIR) minimal$(GUISUFFIX)
|
||||
all: $(OBJDIR) controls$(GUISUFFIX)
|
||||
|
||||
wx:
|
||||
|
||||
@@ -39,11 +39,11 @@ hp:
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
minimal$(GUISUFFIX): $(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
|
||||
controls$(GUISUFFIX): $(OBJDIR)/controls.$(OBJSUFF) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o controls$(GUISUFFIX) $(OBJDIR)/controls.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
|
||||
|
||||
$(OBJDIR)/minimal.$(OBJSUFF): minimal.$(SRCSUFF)
|
||||
$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF)
|
||||
$(OBJDIR)/controls.$(OBJSUFF): controls.$(SRCSUFF)
|
||||
$(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF)
|
||||
|
||||
clean_motif:
|
||||
$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
|
||||
@@ -55,4 +55,4 @@ clean_hp:
|
||||
$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
|
||||
|
||||
cleanany:
|
||||
rm -f $(OBJECTS) minimal$(GUISUFFIX) core
|
||||
rm -f $(OBJECTS) controls$(GUISUFFIX) core
|
||||
|
||||
@@ -19,11 +19,11 @@ APPINCS =
|
||||
#************************************************************************
|
||||
|
||||
# Name of main module
|
||||
MAIN = minimal
|
||||
MAIN = controls
|
||||
|
||||
# Object modules of the application.
|
||||
OBJS = minimal.obj
|
||||
OBJLIST =minimal.obj
|
||||
OBJS = controls.obj
|
||||
OBJLIST =controls.obj
|
||||
|
||||
.include [--.src]makevms.env
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ WXDIR = ..\..
|
||||
!include $(WXDIR)\src\makewat.env
|
||||
|
||||
WXLIB = $(WXDIR)\lib
|
||||
NAME = minimal
|
||||
NAME = controls
|
||||
LNK = $(name).lnk
|
||||
OBJS = $(name).obj
|
||||
|
||||
|
||||
Reference in New Issue
Block a user