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

Changed name of controls sample.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-10 10:36:57 +00:00
parent a19102646e
commit 447daba1ce
11 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/controls/Makefile.in
View File

@@ -10,11 +10,11 @@ RULE=bin
BIN_TARGET=test BIN_TARGET=test
# define library sources # define library sources
BIN_SRC=\ BIN_SRC=\
minimal.cpp controls.cpp
#define library objects #define library objects
BIN_OBJ=\ BIN_OBJ=\
minimal.o controls.o
# additional things needed to link # additional things needed to link
BIN_LINK= BIN_LINK=

3
samples/controls/minimal.cpp → samples/controls/controls.cpp
View File

@@ -199,7 +199,8 @@ void MyPanel::OnListBox( wxCommandEvent &event )
void MyPanel::OnListBoxButtons( wxCommandEvent &WXUNUSED(event) ) void MyPanel::OnListBoxButtons( wxCommandEvent &WXUNUSED(event) )
{ {
m_notebook->DeletePage( 1 ); if (m_notebook->GetPageCount() > 1)
m_notebook->DeletePage( 1 );
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

8
samples/controls/makefile.b32
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%W% %G%"
# #
# Makefile : Builds minimal example (DOS). # Makefile : Builds controls example (DOS).
# WXWIN and BCCDIR are set by parent make # WXWIN and BCCDIR are set by parent make
@@ -19,7 +19,7 @@ WXINC = $(WXDIR)\include\msw
WXLIB = $(WXLIBDIR)\wx32.lib WXLIB = $(WXLIBDIR)\wx32.lib
LIBS=$(WXLIB) cw32 import32 ole2w32 LIBS=$(WXLIB) cw32 import32 ole2w32
TARGET=minimal TARGET=controls
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
@@ -32,7 +32,7 @@ DEBUG_FLAGS =
!endif !endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
OBJECTS = minimal.obj OBJECTS = controls.obj
$(TARGET).exe: $(OBJECTS) $(TARGET).def $(TARGET).res $(TARGET).exe: $(OBJECTS) $(TARGET).def $(TARGET).res
tlink32 $(LINKFLAGS) @&&! tlink32 $(LINKFLAGS) @&&!
@@ -50,7 +50,7 @@ $(TARGET).def
.c.obj: .c.obj:
bcc32 $(CPPFLAGS) -P- -c {$< } bcc32 $(CPPFLAGS) -P- -c {$< }
minimal.obj: minimal.$(SRCSUFF) controls.obj: controls.$(SRCSUFF)
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc $(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET) brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)

26
samples/controls/makefile.bcc
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%W% %G%"
# #
# Makefile : Builds minimal example (DOS). # Makefile : Builds controls example (DOS).
!if "$(BCCDIR)" == "" !if "$(BCCDIR)" == ""
!error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4 !error You must define the BCCDIR variable in autoexec.bat, e.g. BCCDIR=d:\bc4
@@ -20,7 +20,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
!include $(WXDIR)\src\makebcc.env !include $(WXDIR)\src\makebcc.env
THISDIR = $(WXDIR)\samples\minimal THISDIR = $(WXDIR)\samples\controls
WXLIB = $(WXDIR)\lib\wx.lib WXLIB = $(WXDIR)\lib\wx.lib
LIBS=$(WXLIB) mathwl cwl import LIBS=$(WXLIB) mathwl cwl import
INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw INC=-I$(WXDIR)\include\base -I$(WXDIR)\include\msw
@@ -41,29 +41,29 @@ DEBUG_FLAGS=
!endif !endif
CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) 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) @&&! tlink $(LINKFLAGS) @&&!
c0wl.obj minimal.obj c0wl.obj controls.obj
minimal controls
nul nul
$(LIBS) $(LIBS)
minimal.def controls.def
! !
rc -31 -K minimal.res rc -31 -K controls.res
.$(SRCSUFF).obj: .$(SRCSUFF).obj:
bcc $(CPPFLAGS) -c {$< } bcc $(CPPFLAGS) -c {$< }
minimal.obj: minimal.$(SRCSUFF) controls.obj: controls.$(SRCSUFF)
minimal.res : minimal.rc $(WXDIR)\include\msw\wx.rc controls.res : controls.rc $(WXDIR)\include\msw\wx.rc
rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa minimal rc -r /i$(BCCDIR)\include /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa controls
clean: clean:
-erase *.obj -erase *.obj

26
samples/controls/makefile.dos
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%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 # Use FINAL=1 argument to nmake to build final version with no debugging
# info # info
@@ -15,17 +15,17 @@ WXDIR = $(WXWIN)
!include $(WXDIR)\src\makemsc.env !include $(WXDIR)\src\makemsc.env
THISDIR = $(WXDIR)\samples\minimal THISDIR = $(WXDIR)\samples\controls
!ifndef FINAL !ifndef FINAL
FINAL=0 FINAL=0
!endif !endif
HEADERS = HEADERS =
SOURCES = minimal.$(SRCSUFF) SOURCES = controls.$(SRCSUFF)
OBJECTS = minimal.obj OBJECTS = controls.obj
all: minimal.exe all: controls.exe
wx: wx:
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
@@ -37,24 +37,24 @@ wxclean:
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(THISDIR) 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) @<< link $(LINKFLAGS) @<<
minimal.obj $(WXDIR)\src\msw\dummy.obj, controls.obj $(WXDIR)\src\msw\dummy.obj,
minimal, controls,
NUL, NUL,
$(LIBS), $(LIBS),
minimal.def controls.def
; ;
<< <<
rc -K minimal.res rc -K controls.res
minimal.obj: minimal.$(SRCSUFF) controls.obj: controls.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<< <<
minimal.res : minimal.rc $(WXDIR)\include\wx\msw\wx.rc controls.res : controls.rc $(WXDIR)\include\wx\msw\wx.rc
rc -r /i$(WXDIR)\include minimal rc -r /i$(WXDIR)\include controls
clean: clean:
-erase *.obj -erase *.obj

20
samples/controls/makefile.g95
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%W% %G%"
# #
# Makefile for minimal example (UNIX). # Makefile for controls example (UNIX).
WXDIR = ../.. WXDIR = ../..
@@ -15,23 +15,23 @@ WXDIR = ../..
# this central makefile. # this central makefile.
include $(WXDIR)/src/makeg95.env 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: wx:
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)
minimal$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB) controls$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS) $(CC) $(LDFLAGS) -o controls$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
$(OBJDIR)/minimal.$(OBJSUFF): minimal.$(SRCSUFF) $(OBJDIR)/controls.$(OBJSUFF): controls.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF) $(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF)
$(OBJDIR)/minimal_resources.o: minimal.rc $(OBJDIR)/controls_resources.o: controls.rc
$(RESCOMP) -i minimal.rc -o $(OBJDIR)/minimal_resources.o $(RESFLAGS) $(RESCOMP) -i controls.rc -o $(OBJDIR)/controls_resources.o $(RESFLAGS)
clean: clean:
rm -f $(OBJECTS) minimal$(GUISUFFIX).exe core *.rsc *.res rm -f $(OBJECTS) controls$(GUISUFFIX).exe core *.rsc *.res

8
samples/controls/makefile.nt
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%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 # Use FINAL=1 argument to nmake to build final version with no debugging
# info # info
@@ -18,9 +18,9 @@ WXUSINGDLL=0
!include $(WXDIR)\src\ntwxwin.mak !include $(WXDIR)\src\ntwxwin.mak
THISDIR = $(WXDIR)\samples\minimal THISDIR = $(WXDIR)\samples\controls
PROGRAM=minimal PROGRAM=controls
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj
$(PROGRAM): $(PROGRAM).exe $(PROGRAM): $(PROGRAM).exe

5
samples/controls/makefile.sc
View File

@@ -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. # NOTE that peripheral libraries are now dealt in main wxWindows makefile.
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
@@ -24,7 +25,7 @@ LIBS=$(WXLIB) libw.lib commdlg.lib shell.lib
.rc.res: .rc.res:
*$(RC) -r -I$(INCLUDE) $< *$(RC) -r -I$(INCLUDE) $<
minimal.exe: minimal.obj minimal.def minimal.res controls.exe: controls.obj controls.def controls.res
*$(CC) $(LDFLAGS) -o$@ $** $(LIBS) *$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
clean: clean:

16
samples/controls/makefile.unx
View File

@@ -7,7 +7,7 @@
# #
# "%W% %G%" # "%W% %G%"
# #
# Makefile for minimal example (UNIX). # Makefile for controls example (UNIX).
WXDIR = ../.. WXDIR = ../..
@@ -15,11 +15,11 @@ WXDIR = ../..
# this central makefile. # this central makefile.
include $(WXDIR)/src/make.env include $(WXDIR)/src/make.env
OBJECTS = $(OBJDIR)/minimal.$(OBJSUFF) OBJECTS = $(OBJDIR)/controls.$(OBJSUFF)
.SUFFIXES: .SUFFIXES:
all: $(OBJDIR) minimal$(GUISUFFIX) all: $(OBJDIR) controls$(GUISUFFIX)
wx: wx:
@@ -39,11 +39,11 @@ hp:
$(OBJDIR): $(OBJDIR):
mkdir $(OBJDIR) mkdir $(OBJDIR)
minimal$(GUISUFFIX): $(OBJDIR)/minimal.$(OBJSUFF) $(WXLIB) controls$(GUISUFFIX): $(OBJDIR)/controls.$(OBJSUFF) $(WXLIB)
$(CC) $(LDFLAGS) -o minimal$(GUISUFFIX) $(OBJDIR)/minimal.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS) $(CC) $(LDFLAGS) -o controls$(GUISUFFIX) $(OBJDIR)/controls.$(OBJSUFF) $(XVIEW_LINK) $(LDLIBS)
$(OBJDIR)/minimal.$(OBJSUFF): minimal.$(SRCSUFF) $(OBJDIR)/controls.$(OBJSUFF): controls.$(SRCSUFF)
$(CC) -c $(CPPFLAGS) -o $@ minimal.$(SRCSUFF) $(CC) -c $(CPPFLAGS) -o $@ controls.$(SRCSUFF)
clean_motif: clean_motif:
$(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany $(MAKE) -f makefile.unx GUISUFFIX=_motif cleanany
@@ -55,4 +55,4 @@ clean_hp:
$(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany $(MAKE) -f makefile.unx GUISUFFIX=_hp cleanany
cleanany: cleanany:
rm -f $(OBJECTS) minimal$(GUISUFFIX) core rm -f $(OBJECTS) controls$(GUISUFFIX) core

6
samples/controls/makefile.vms
View File

@@ -19,11 +19,11 @@ APPINCS =
#************************************************************************ #************************************************************************
# Name of main module # Name of main module
MAIN = minimal MAIN = controls
# Object modules of the application. # Object modules of the application.
OBJS = minimal.obj OBJS = controls.obj
OBJLIST =minimal.obj OBJLIST =controls.obj
.include [--.src]makevms.env .include [--.src]makevms.env

2
samples/controls/makefile.wat
View File

@@ -10,7 +10,7 @@ WXDIR = ..\..
!include $(WXDIR)\src\makewat.env !include $(WXDIR)\src\makewat.env
WXLIB = $(WXDIR)\lib WXLIB = $(WXDIR)\lib
NAME = minimal NAME = controls
LNK = $(name).lnk LNK = $(name).lnk
OBJS = $(name).obj OBJS = $(name).obj