From 3b9bf29a74884ddd4e706d8807303678150b6bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 3 Aug 2003 18:09:38 +0000 Subject: [PATCH] moved FL samples into single directory git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/fl/fl_demo1/Makefile.in | 25 -- contrib/samples/fl/fl_demo1/fl_demo.dsp | 175 ---------- contrib/samples/fl/fl_demo1/fl_demo.dsw | 29 -- contrib/samples/fl/fl_demo1/makefile.b32 | 23 -- contrib/samples/fl/fl_demo1/makefile.g95 | 18 - contrib/samples/fl/fl_demo1/makefile.vc | 38 --- contrib/samples/fl/fl_demo2/Makefile.in | 25 -- contrib/samples/fl/fl_demo2/fl_demo.dsp | 175 ---------- contrib/samples/fl/fl_demo2/fl_demo.dsw | 29 -- contrib/samples/fl/fl_demo2/makefile.b32 | 23 -- contrib/samples/fl/fl_demo2/makefile.g95 | 18 - contrib/samples/fl/fl_demo2/makefile.vc | 38 --- contrib/samples/fl/fl_sample1/Makefile.in | 25 -- contrib/samples/fl/fl_sample1/fl_demo.dsp | 175 ---------- contrib/samples/fl/fl_sample1/fl_demo.dsw | 29 -- contrib/samples/fl/fl_sample1/fl_sample1.cpp | 196 ----------- contrib/samples/fl/fl_sample1/fl_sample1.rc | 3 - contrib/samples/fl/fl_sample1/makefile.b32 | 23 -- contrib/samples/fl/fl_sample1/makefile.g95 | 18 - contrib/samples/fl/fl_sample1/makefile.vc | 38 --- contrib/samples/fl/fl_sample2/Makefile.in | 25 -- contrib/samples/fl/fl_sample2/fl_demo.dsp | 175 ---------- contrib/samples/fl/fl_sample2/fl_demo.dsw | 29 -- contrib/samples/fl/fl_sample2/fl_sample2.cpp | 194 ----------- contrib/samples/fl/fl_sample2/fl_sample2.rc | 3 - contrib/samples/fl/fl_sample2/makefile.b32 | 23 -- contrib/samples/fl/fl_sample2/makefile.g95 | 18 - contrib/samples/fl/fl_sample2/makefile.vc | 38 --- contrib/samples/fl/fl_sample3/Makefile.in | 25 -- contrib/samples/fl/fl_sample3/fl_demo.dsp | 175 ---------- contrib/samples/fl/fl_sample3/fl_demo.dsw | 29 -- contrib/samples/fl/fl_sample3/fl_sample3.cpp | 337 ------------------- contrib/samples/fl/fl_sample3/fl_sample3.rc | 3 - contrib/samples/fl/fl_sample3/makefile.b32 | 23 -- contrib/samples/fl/fl_sample3/makefile.g95 | 18 - contrib/samples/fl/fl_sample3/makefile.vc | 38 --- 36 files changed, 2276 deletions(-) delete mode 100644 contrib/samples/fl/fl_demo1/Makefile.in delete mode 100644 contrib/samples/fl/fl_demo1/fl_demo.dsp delete mode 100644 contrib/samples/fl/fl_demo1/fl_demo.dsw delete mode 100644 contrib/samples/fl/fl_demo1/makefile.b32 delete mode 100644 contrib/samples/fl/fl_demo1/makefile.g95 delete mode 100644 contrib/samples/fl/fl_demo1/makefile.vc delete mode 100644 contrib/samples/fl/fl_demo2/Makefile.in delete mode 100644 contrib/samples/fl/fl_demo2/fl_demo.dsp delete mode 100644 contrib/samples/fl/fl_demo2/fl_demo.dsw delete mode 100644 contrib/samples/fl/fl_demo2/makefile.b32 delete mode 100644 contrib/samples/fl/fl_demo2/makefile.g95 delete mode 100644 contrib/samples/fl/fl_demo2/makefile.vc delete mode 100644 contrib/samples/fl/fl_sample1/Makefile.in delete mode 100644 contrib/samples/fl/fl_sample1/fl_demo.dsp delete mode 100644 contrib/samples/fl/fl_sample1/fl_demo.dsw delete mode 100644 contrib/samples/fl/fl_sample1/fl_sample1.cpp delete mode 100644 contrib/samples/fl/fl_sample1/fl_sample1.rc delete mode 100644 contrib/samples/fl/fl_sample1/makefile.b32 delete mode 100644 contrib/samples/fl/fl_sample1/makefile.g95 delete mode 100644 contrib/samples/fl/fl_sample1/makefile.vc delete mode 100644 contrib/samples/fl/fl_sample2/Makefile.in delete mode 100644 contrib/samples/fl/fl_sample2/fl_demo.dsp delete mode 100644 contrib/samples/fl/fl_sample2/fl_demo.dsw delete mode 100644 contrib/samples/fl/fl_sample2/fl_sample2.cpp delete mode 100644 contrib/samples/fl/fl_sample2/fl_sample2.rc delete mode 100644 contrib/samples/fl/fl_sample2/makefile.b32 delete mode 100644 contrib/samples/fl/fl_sample2/makefile.g95 delete mode 100644 contrib/samples/fl/fl_sample2/makefile.vc delete mode 100644 contrib/samples/fl/fl_sample3/Makefile.in delete mode 100644 contrib/samples/fl/fl_sample3/fl_demo.dsp delete mode 100644 contrib/samples/fl/fl_sample3/fl_demo.dsw delete mode 100644 contrib/samples/fl/fl_sample3/fl_sample3.cpp delete mode 100644 contrib/samples/fl/fl_sample3/fl_sample3.rc delete mode 100644 contrib/samples/fl/fl_sample3/makefile.b32 delete mode 100644 contrib/samples/fl/fl_sample3/makefile.g95 delete mode 100644 contrib/samples/fl/fl_sample3/makefile.vc diff --git a/contrib/samples/fl/fl_demo1/Makefile.in b/contrib/samples/fl/fl_demo1/Makefile.in deleted file mode 100644 index 83f4fe3496..0000000000 --- a/contrib/samples/fl/fl_demo1/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# "%W% %G%" -# -# Makefile : Builds sample on UNIX/Linux. - -top_srcdir = @top_srcdir@/.. -top_builddir = ../../../.. - -TARGET = fl_demo1 - -program_dir = contrib/samples/fl/$(TARGET) - -APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\" -APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).o - -include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/fl/fl_demo1/fl_demo.dsp b/contrib/samples/fl/fl_demo1/fl_demo.dsp deleted file mode 100644 index 5801b855a7..0000000000 --- a/contrib/samples/fl/fl_demo1/fl_demo.dsp +++ /dev/null @@ -1,175 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fl_demo1" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=fl_demo1 - Win32 Debug DLL -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo1 - Win32 Debug DLL" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fl_demo1 - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "fl_demo1 - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "fl_demo1 - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "fl_demo1 - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fl_demo1 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_DLL" -# PROP BASE Intermediate_Dir "Debug_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_DLL" -# PROP BASE Intermediate_Dir "Release_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ENDIF - -# Begin Target - -# Name "fl_demo1 - Win32 Release" -# Name "fl_demo1 - Win32 Debug" -# Name "fl_demo1 - Win32 Debug DLL" -# Name "fl_demo1 - Win32 Release DLL" -# Begin Source File - -SOURCE=.\fl_demo1.cpp - -!IF "$(CFG)" == "fl_demo1 - Win32 Release" - -!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug" - -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug DLL" - -# ADD BASE CPP /Yc"wx/wxprec.h" -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Release DLL" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\fl_demo1.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../../include" -# End Source File -# End Target -# End Project diff --git a/contrib/samples/fl/fl_demo1/fl_demo.dsw b/contrib/samples/fl/fl_demo1/fl_demo.dsw deleted file mode 100644 index f75328ad21..0000000000 --- a/contrib/samples/fl/fl_demo1/fl_demo.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "fl_demo1"=.\fl_demo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/contrib/samples/fl/fl_demo1/makefile.b32 b/contrib/samples/fl/fl_demo1/makefile.b32 deleted file mode 100644 index 710bb8d2b6..0000000000 --- a/contrib/samples/fl/fl_demo1/makefile.b32 +++ /dev/null @@ -1,23 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds sample for 32-bit BC++ - -WXDIR = ..\..\..\.. -TARGET = fl_demo1 - -EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\" -!if "$(FINAL)" == "1" -EXTRALIBS = $(WSLIBDIR)\fl.lib -!else -EXTRALIBS = $(WSLIBDIR)\fld.lib -!endif - -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.b32 - diff --git a/contrib/samples/fl/fl_demo1/makefile.g95 b/contrib/samples/fl/fl_demo1/makefile.g95 deleted file mode 100644 index 27c8f178bc..0000000000 --- a/contrib/samples/fl/fl_demo1/makefile.g95 +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile for wxWorkshop for mingw & cygwin. - -WXDIR = ../../../.. -TARGET = fl_demo1 - -EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\" -EXTRALIBS = $(WXDIR)/lib/libfl.a - -OBJECTS = $(TARGET).o - -include $(WXDIR)/src/makeprog.g95 diff --git a/contrib/samples/fl/fl_demo1/makefile.vc b/contrib/samples/fl/fl_demo1/makefile.vc deleted file mode 100644 index e997c2c79d..0000000000 --- a/contrib/samples/fl/fl_demo1/makefile.vc +++ /dev/null @@ -1,38 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds fl sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. - -WXDIR = ..\..\..\.. -TARGET = fl_demo1 - -EXTRAINC = -DBMP_DIR=\"../bitmaps/\" - -!if "$(WXUSING_FL_DLL)" == "1" -# Define WXUSING_FL_DLL so the compiler knows it is set. -EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL -# Set to use wxWin in DLL format... -WXUSINGDLL = 1 - -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fldll.lib -!else -EXTRALIBS = $(WXDIR)\lib\fldlld.lib -!endif -!else -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fl.lib -!else -EXTRALIBS = $(WXDIR)\lib\fld.lib -!endif -!endif - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.vc diff --git a/contrib/samples/fl/fl_demo2/Makefile.in b/contrib/samples/fl/fl_demo2/Makefile.in deleted file mode 100644 index da24607db2..0000000000 --- a/contrib/samples/fl/fl_demo2/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# "%W% %G%" -# -# Makefile : Builds sample on UNIX/Linux. - -top_srcdir = @top_srcdir@/.. -top_builddir = ../../../.. - -TARGET = fl_demo2 - -program_dir = contrib/samples/fl/$(TARGET) - -APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\" -APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).o - -include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/fl/fl_demo2/fl_demo.dsp b/contrib/samples/fl/fl_demo2/fl_demo.dsp deleted file mode 100644 index aacdab0543..0000000000 --- a/contrib/samples/fl/fl_demo2/fl_demo.dsp +++ /dev/null @@ -1,175 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fl_demo2" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=fl_demo2 - Win32 Debug DLL -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo2 - Win32 Debug DLL" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fl_demo2 - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "fl_demo2 - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "fl_demo2 - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "fl_demo2 - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fl_demo2 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_DLL" -# PROP BASE Intermediate_Dir "Debug_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_DLL" -# PROP BASE Intermediate_Dir "Release_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ENDIF - -# Begin Target - -# Name "fl_demo2 - Win32 Release" -# Name "fl_demo2 - Win32 Debug" -# Name "fl_demo2 - Win32 Debug DLL" -# Name "fl_demo2 - Win32 Release DLL" -# Begin Source File - -SOURCE=.\fl_demo2.cpp - -!IF "$(CFG)" == "fl_demo2 - Win32 Release" - -!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug" - -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug DLL" - -# ADD BASE CPP /Yc"wx/wxprec.h" -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Release DLL" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\fl_demo2.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../../include" -# End Source File -# End Target -# End Project diff --git a/contrib/samples/fl/fl_demo2/fl_demo.dsw b/contrib/samples/fl/fl_demo2/fl_demo.dsw deleted file mode 100644 index aadb7e2ca2..0000000000 --- a/contrib/samples/fl/fl_demo2/fl_demo.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "fl_demo2"=.\fl_demo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/contrib/samples/fl/fl_demo2/makefile.b32 b/contrib/samples/fl/fl_demo2/makefile.b32 deleted file mode 100644 index 27524e7d2c..0000000000 --- a/contrib/samples/fl/fl_demo2/makefile.b32 +++ /dev/null @@ -1,23 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds sample for 32-bit BC++ - -WXDIR = ..\..\..\.. -TARGET = fl_demo2 - -EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\" -!if "$(FINAL)" == "1" -EXTRALIBS = $(WSLIBDIR)\fl.lib -!else -EXTRALIBS = $(WSLIBDIR)\fld.lib -!endif - -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.b32 - diff --git a/contrib/samples/fl/fl_demo2/makefile.g95 b/contrib/samples/fl/fl_demo2/makefile.g95 deleted file mode 100644 index ff6a16f291..0000000000 --- a/contrib/samples/fl/fl_demo2/makefile.g95 +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile for wxWorkshop for mingw & cygwin. - -WXDIR = ../../../.. -TARGET = fl_demo2 - -EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\" -EXTRALIBS = $(WXDIR)/lib/libfl.a - -OBJECTS = $(TARGET).o - -include $(WXDIR)/src/makeprog.g95 diff --git a/contrib/samples/fl/fl_demo2/makefile.vc b/contrib/samples/fl/fl_demo2/makefile.vc deleted file mode 100644 index f3414ac254..0000000000 --- a/contrib/samples/fl/fl_demo2/makefile.vc +++ /dev/null @@ -1,38 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds fl sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. - -WXDIR = ..\..\..\.. -TARGET = fl_demo2 - -EXTRAINC = -DBMP_DIR=\"../bitmaps/\" - -!if "$(WXUSING_FL_DLL)" == "1" -# Define WXUSING_FL_DLL so the compiler knows it is set. -EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL -# Set to use wxWin in DLL format... -WXUSINGDLL = 1 - -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fldll.lib -!else -EXTRALIBS = $(WXDIR)\lib\fldlld.lib -!endif -!else -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fl.lib -!else -EXTRALIBS = $(WXDIR)\lib\fld.lib -!endif -!endif - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.vc diff --git a/contrib/samples/fl/fl_sample1/Makefile.in b/contrib/samples/fl/fl_sample1/Makefile.in deleted file mode 100644 index ad507429e4..0000000000 --- a/contrib/samples/fl/fl_sample1/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# "%W% %G%" -# -# Makefile : Builds sample on UNIX/Linux. - -top_srcdir = @top_srcdir@/.. -top_builddir = ../../../.. - -TARGET = fl_sample1 - -program_dir = contrib/samples/fl/$(TARGET) - -APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\" -APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).o - -include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/fl/fl_sample1/fl_demo.dsp b/contrib/samples/fl/fl_sample1/fl_demo.dsp deleted file mode 100644 index 9ed379a576..0000000000 --- a/contrib/samples/fl/fl_sample1/fl_demo.dsp +++ /dev/null @@ -1,175 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fl_sample1" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=fl_sample1 - Win32 Debug DLL -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample1 - Win32 Debug DLL" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fl_sample1 - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample1 - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample1 - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample1 - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fl_sample1 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_DLL" -# PROP BASE Intermediate_Dir "Debug_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_DLL" -# PROP BASE Intermediate_Dir "Release_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ENDIF - -# Begin Target - -# Name "fl_sample1 - Win32 Release" -# Name "fl_sample1 - Win32 Debug" -# Name "fl_sample1 - Win32 Debug DLL" -# Name "fl_sample1 - Win32 Release DLL" -# Begin Source File - -SOURCE=.\fl_sample1.cpp - -!IF "$(CFG)" == "fl_sample1 - Win32 Release" - -!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Debug" - -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Debug DLL" - -# ADD BASE CPP /Yc"wx/wxprec.h" -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_sample1 - Win32 Release DLL" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\fl_sample1.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../../include" -# End Source File -# End Target -# End Project diff --git a/contrib/samples/fl/fl_sample1/fl_demo.dsw b/contrib/samples/fl/fl_sample1/fl_demo.dsw deleted file mode 100644 index 0ae6cf10be..0000000000 --- a/contrib/samples/fl/fl_sample1/fl_demo.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "fl_sample1"=.\fl_demo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/contrib/samples/fl/fl_sample1/fl_sample1.cpp b/contrib/samples/fl/fl_sample1/fl_sample1.cpp deleted file mode 100644 index 7df3e22442..0000000000 --- a/contrib/samples/fl/fl_sample1/fl_sample1.cpp +++ /dev/null @@ -1,196 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: fl_sample1.cpp -// Purpose: Contrib. demo -// Author: Aleksandras Gluchovas -// Modified by: Sebastian Haase (June 21, 2001) -// Created: 24/11/98 -// RCS-ID: $Id$ -// Copyright: (c) Aleksandras Gluchovas -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/textctrl.h" - -// fl headers -#include "wx/fl/controlbar.h" - -// plugins used -#include "wx/fl/barhintspl.h" -#include "wx/fl/hintanimpl.h" - -#define ID_LOAD 102 -#define ID_STORE 103 -#define ID_QUIT 104 - -class MyApp: public wxApp -{ -public: - bool OnInit(void); -}; - -class MyFrame: public wxFrame -{ -protected: - wxFrameLayout* mpLayout; - wxWindow* mpClientWnd; - wxPanel* mpInternalFrm; - - wxTextCtrl* CreateTextCtrl( const wxString& value ); - -public: - MyFrame( wxWindow* parent, char *title ); - ~MyFrame(); - - void OnLoad( wxCommandEvent& event ); - void OnStore( wxCommandEvent& event ); - void OnQuit( wxCommandEvent& event ); - - bool OnClose(void) { return TRUE; } - - DECLARE_EVENT_TABLE() -}; - -/***** Implementation for class MyApp *****/ - -IMPLEMENT_APP (MyApp) - -bool MyApp::OnInit(void) -{ - // wxWindows boiler-plate: - - MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample"); - - wxMenu *file_menu = new wxMenu; - - file_menu->Append( ID_LOAD, "&Load layout" ); - file_menu->Append( ID_STORE, "&Store layout" ); - file_menu->AppendSeparator(); - - file_menu->Append( ID_QUIT, "E&xit" ); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, "&File"); - - frame->CreateStatusBar(3); - frame->SetMenuBar(menu_bar); - - frame->Show(TRUE); - - SetTopWindow(frame); - - return TRUE; -} - -/***** Immlementation for class MyFrame *****/ - -BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU( ID_LOAD, MyFrame::OnLoad ) - EVT_MENU( ID_STORE, MyFrame::OnStore ) - EVT_MENU( ID_QUIT, MyFrame::OnQuit ) -END_EVENT_TABLE() - -MyFrame::MyFrame( wxWindow* parent, char *title ) - : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition, - wxSize( 700, 500 ), - wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | - wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION, - "freimas" ) -{ - mpInternalFrm = (wxPanel*)this; - - mpClientWnd = CreateTextCtrl( "Client window" ); - - // btw, creation of internal frame is needed for wxGtk version - // to act correctly (since menu-bar is a separate window there..) - - mpLayout = new wxFrameLayout( mpInternalFrm, mpClientWnd ); - -#if defined(__WXGTK__) || defined(__WXX11__) - // real-time dosn't work well under wxGtk yet - cbCommonPaneProperties props; - mpLayout->GetPaneProperties( props ); - - props.mRealTimeUpdatesOn = FALSE; // off - - mpLayout->SetPaneProperties( props, wxALL_PANES ); -#endif - - mpLayout->PushDefaultPlugins(); - mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso - //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) ); - - cbDimInfo sizes( 80,65, // when docked horizontally - 80,65, // when docked vertically - 80,30, // when floated - TRUE, // the bar is fixed-size - 5, // vertical gap (bar border) - 5 // horizontal gap (bar border) - ); - - // drop-in 20 bars - for( int i = 1; i <= 20; ++i ) - { - char buf[4]; - sprintf( buf, "%d", i ); - wxString name = wxString("Bar-"); - name += buf; - - sizes.mIsFixed = i % 5 > 0; // every fifth bar is not fixed-size - - if ( !sizes.mIsFixed ) name += " (flexible)"; - - mpLayout->AddBar( CreateTextCtrl(name),// bar window - sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - name // name to refere in customization pop-ups - ); - } -} - -MyFrame::~MyFrame() -{ - // layout is not a window, should be released manually - if ( mpLayout ) - delete mpLayout; -} - -wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value ) -{ - wxTextCtrl* pCtrl = new wxTextCtrl( mpInternalFrm, -1, value, - wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE ); - - pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) ); - - return pCtrl; -} - -void MyFrame::OnLoad( wxCommandEvent& event ) -{ - wxMessageBox("Hey - you found a BIG question-mark !!"); -} - -void MyFrame::OnStore( wxCommandEvent& event ) -{ - wxMessageBox("Hey - you found another BIG question-mark !!"); -} - -void MyFrame::OnQuit( wxCommandEvent& event ) -{ - Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction - - Close(TRUE); -} - diff --git a/contrib/samples/fl/fl_sample1/fl_sample1.rc b/contrib/samples/fl/fl_sample1/fl_sample1.rc deleted file mode 100644 index 626b82f58a..0000000000 --- a/contrib/samples/fl/fl_sample1/fl_sample1.rc +++ /dev/null @@ -1,3 +0,0 @@ -/* mondrian ICON "mondrian.ico" */ -#include "wx/msw/wx.rc" - diff --git a/contrib/samples/fl/fl_sample1/makefile.b32 b/contrib/samples/fl/fl_sample1/makefile.b32 deleted file mode 100644 index a521961fcf..0000000000 --- a/contrib/samples/fl/fl_sample1/makefile.b32 +++ /dev/null @@ -1,23 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds sample for 32-bit BC++ - -WXDIR = ..\..\..\.. -TARGET = fl_sample1 - -EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\" -!if "$(FINAL)" == "1" -EXTRALIBS = $(WSLIBDIR)\fl.lib -!else -EXTRALIBS = $(WSLIBDIR)\fld.lib -!endif - -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.b32 - diff --git a/contrib/samples/fl/fl_sample1/makefile.g95 b/contrib/samples/fl/fl_sample1/makefile.g95 deleted file mode 100644 index 8c130d4c6e..0000000000 --- a/contrib/samples/fl/fl_sample1/makefile.g95 +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile for wxWorkshop for mingw & cygwin. - -WXDIR = ../../../.. -TARGET = fl_sample1 - -EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\" -EXTRALIBS = $(WXDIR)/lib/libfl.a - -OBJECTS = $(TARGET).o - -include $(WXDIR)/src/makeprog.g95 diff --git a/contrib/samples/fl/fl_sample1/makefile.vc b/contrib/samples/fl/fl_sample1/makefile.vc deleted file mode 100644 index fed37595d7..0000000000 --- a/contrib/samples/fl/fl_sample1/makefile.vc +++ /dev/null @@ -1,38 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds fl sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. - -WXDIR = ..\..\..\.. -TARGET = fl_sample1 - -EXTRAINC = -DBMP_DIR=\"../bitmaps/\" - -!if "$(WXUSING_FL_DLL)" == "1" -# Define WXUSING_FL_DLL so the compiler knows it is set. -EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL -# Set to use wxWin in DLL format... -WXUSINGDLL = 1 - -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fldll.lib -!else -EXTRALIBS = $(WXDIR)\lib\fldlld.lib -!endif -!else -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fl.lib -!else -EXTRALIBS = $(WXDIR)\lib\fld.lib -!endif -!endif - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.vc diff --git a/contrib/samples/fl/fl_sample2/Makefile.in b/contrib/samples/fl/fl_sample2/Makefile.in deleted file mode 100644 index 6a863be5a1..0000000000 --- a/contrib/samples/fl/fl_sample2/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# "%W% %G%" -# -# Makefile : Builds sample on UNIX/Linux. - -top_srcdir = @top_srcdir@/.. -top_builddir = ../../../.. - -TARGET = fl_sample2 - -program_dir = contrib/samples/fl/$(TARGET) - -APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\" -APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).o - -include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/fl/fl_sample2/fl_demo.dsp b/contrib/samples/fl/fl_sample2/fl_demo.dsp deleted file mode 100644 index 5d0d83de5f..0000000000 --- a/contrib/samples/fl/fl_sample2/fl_demo.dsp +++ /dev/null @@ -1,175 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fl_sample2" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=fl_sample2 - Win32 Debug DLL -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample2 - Win32 Debug DLL" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fl_sample2 - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample2 - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample2 - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample2 - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fl_sample2 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_DLL" -# PROP BASE Intermediate_Dir "Debug_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_DLL" -# PROP BASE Intermediate_Dir "Release_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ENDIF - -# Begin Target - -# Name "fl_sample2 - Win32 Release" -# Name "fl_sample2 - Win32 Debug" -# Name "fl_sample2 - Win32 Debug DLL" -# Name "fl_sample2 - Win32 Release DLL" -# Begin Source File - -SOURCE=.\fl_sample2.cpp - -!IF "$(CFG)" == "fl_sample2 - Win32 Release" - -!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Debug" - -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Debug DLL" - -# ADD BASE CPP /Yc"wx/wxprec.h" -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_sample2 - Win32 Release DLL" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\fl_sample2.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../../include" -# End Source File -# End Target -# End Project diff --git a/contrib/samples/fl/fl_sample2/fl_demo.dsw b/contrib/samples/fl/fl_sample2/fl_demo.dsw deleted file mode 100644 index ae31c3663b..0000000000 --- a/contrib/samples/fl/fl_sample2/fl_demo.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "fl_sample2"=.\fl_demo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/contrib/samples/fl/fl_sample2/fl_sample2.cpp b/contrib/samples/fl/fl_sample2/fl_sample2.cpp deleted file mode 100644 index 281f49fa14..0000000000 --- a/contrib/samples/fl/fl_sample2/fl_sample2.cpp +++ /dev/null @@ -1,194 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: fl_sample2.cpp -// Purpose: Contrib. demo -// Author: Aleksandras Gluchovas -// Modified by: Sebastian Haase (June 21, 2001) -// Created: 24/11/98 -// RCS-ID: $Id$ -// Copyright: (c) Aleksandras Gluchovas -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/textctrl.h" - -// fl headers -#include "wx/fl/controlbar.h" - -// plugins used -#include "wx/fl/barhintspl.h" -#include "wx/fl/hintanimpl.h" - -#define ID_LOAD 102 -#define ID_STORE 103 -#define ID_QUIT 104 - - -class MyApp: public wxApp -{ -public: - bool OnInit(void); -}; - -class MyFrame: public wxFrame -{ -protected: - wxFrameLayout* mpLayout; - wxWindow* mpClientWnd; - - wxTextCtrl* CreateTextCtrl( const wxString& value ); - -public: - MyFrame( wxWindow* parent, char *title ); - ~MyFrame(); - - void populateMyFrame(); - void OnLoad( wxCommandEvent& event ); - void OnStore( wxCommandEvent& event ); - void OnQuit( wxCommandEvent& event ); - - bool OnClose(void) { return TRUE; } - - DECLARE_EVENT_TABLE() -}; - -/***** Implementation for class MyApp *****/ - -IMPLEMENT_APP (MyApp) - -bool MyApp::OnInit(void) -{ - // wxWindows boiler-plate: - - MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample"); - - wxMenu *file_menu = new wxMenu; - - file_menu->Append( ID_LOAD, "&Load layout" ); - file_menu->Append( ID_STORE, "&Store layout" ); - file_menu->AppendSeparator(); - - file_menu->Append( ID_QUIT, "E&xit" ); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, "&File"); - - frame->CreateStatusBar(3); - frame->SetMenuBar(menu_bar); - - frame->Show(TRUE); - SetTopWindow(frame); - frame->populateMyFrame(); - - return TRUE; -} - -/***** Immlementation for class MyFrame *****/ - -BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU( ID_LOAD, MyFrame::OnLoad ) - EVT_MENU( ID_STORE, MyFrame::OnStore ) - EVT_MENU( ID_QUIT, MyFrame::OnQuit ) -END_EVENT_TABLE() - -MyFrame::MyFrame( wxWindow* parent, char *title ) - : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition, - wxSize( 700, 500 ), - wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | - wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION, - "freimas" ) -{ -} - -void MyFrame::populateMyFrame() -{ - mpClientWnd = CreateTextCtrl( "Client window" ); - - mpLayout = new wxFrameLayout( this, mpClientWnd ); - - /// mpLayout->PushDefaultPlugins(); - /// mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso - /// //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) ); - - cbDimInfo sizes( 80,65, // when docked horizontally - 80,165, // when docked vertically - 180,30, // when floated - TRUE, // the bar is fixed-size - 5, // vertical gap (bar border) - 5 // horizontal gap (bar border) - ); - - // drop-in 20 bars - for( int i = 1; i <= 10; ++i ) - { - wxSleep(1); - wxYield(); // CHECK! - - char buf[4]; - sprintf( buf, "%d", i ); - wxString name = wxString("Bar-"); - name += buf; - - //sizes.mIsFixed = i % 2 > 0; // every fifth bar is not fixed-size - - if ( !sizes.mIsFixed ) name += " (flexible)"; - // mpLayout->AddBar( CreateTextCtrl(name),// bar window - mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window - sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - name // name to refere in customization pop-ups - ); - - mpLayout->RecalcLayout(true); - - // Layout(); - // Refresh(); - } -} - -MyFrame::~MyFrame() -{ - // layout is not a window, should be released manually - if ( mpLayout ) - delete mpLayout; -} - -wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value ) -{ - wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, - wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE ); - - pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) ); - - return pCtrl; -} - -void MyFrame::OnLoad( wxCommandEvent& event ) -{ - wxMessageBox("Hey - you found a BIG question-mark !!"); -} - -void MyFrame::OnStore( wxCommandEvent& event ) -{ - wxMessageBox("Hey - you found another BIG question-mark !!"); -} - -void MyFrame::OnQuit( wxCommandEvent& event ) -{ - Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction - - Close(TRUE); -} - diff --git a/contrib/samples/fl/fl_sample2/fl_sample2.rc b/contrib/samples/fl/fl_sample2/fl_sample2.rc deleted file mode 100644 index 626b82f58a..0000000000 --- a/contrib/samples/fl/fl_sample2/fl_sample2.rc +++ /dev/null @@ -1,3 +0,0 @@ -/* mondrian ICON "mondrian.ico" */ -#include "wx/msw/wx.rc" - diff --git a/contrib/samples/fl/fl_sample2/makefile.b32 b/contrib/samples/fl/fl_sample2/makefile.b32 deleted file mode 100644 index f8093f4a26..0000000000 --- a/contrib/samples/fl/fl_sample2/makefile.b32 +++ /dev/null @@ -1,23 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds sample for 32-bit BC++ - -WXDIR = ..\..\..\.. -TARGET = fl_sample2 - -EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\" -!if "$(FINAL)" == "1" -EXTRALIBS = $(WSLIBDIR)\fl.lib -!else -EXTRALIBS = $(WSLIBDIR)\fld.lib -!endif - -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.b32 - diff --git a/contrib/samples/fl/fl_sample2/makefile.g95 b/contrib/samples/fl/fl_sample2/makefile.g95 deleted file mode 100644 index e3ac85358d..0000000000 --- a/contrib/samples/fl/fl_sample2/makefile.g95 +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile for wxWorkshop for mingw & cygwin. - -WXDIR = ../../../.. -TARGET = fl_sample2 - -EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\" -EXTRALIBS = $(WXDIR)/lib/libfl.a - -OBJECTS = $(TARGET).o - -include $(WXDIR)/src/makeprog.g95 diff --git a/contrib/samples/fl/fl_sample2/makefile.vc b/contrib/samples/fl/fl_sample2/makefile.vc deleted file mode 100644 index 22340ab393..0000000000 --- a/contrib/samples/fl/fl_sample2/makefile.vc +++ /dev/null @@ -1,38 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds fl sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. - -WXDIR = ..\..\..\.. -TARGET = fl_sample2 - -EXTRAINC = -DBMP_DIR=\"../bitmaps/\" - -!if "$(WXUSING_FL_DLL)" == "1" -# Define WXUSING_FL_DLL so the compiler knows it is set. -EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL -# Set to use wxWin in DLL format... -WXUSINGDLL = 1 - -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fldll.lib -!else -EXTRALIBS = $(WXDIR)\lib\fldlld.lib -!endif -!else -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fl.lib -!else -EXTRALIBS = $(WXDIR)\lib\fld.lib -!endif -!endif - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.vc diff --git a/contrib/samples/fl/fl_sample3/Makefile.in b/contrib/samples/fl/fl_sample3/Makefile.in deleted file mode 100644 index fab8e27cce..0000000000 --- a/contrib/samples/fl/fl_sample3/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# "%W% %G%" -# -# Makefile : Builds sample on UNIX/Linux. - -top_srcdir = @top_srcdir@/.. -top_builddir = ../../../.. - -TARGET = fl_sample3 - -program_dir = contrib/samples/fl/$(TARGET) - -APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\" -APPEXTRALIBS = $(top_builddir)/lib/lib@WX_LIBRARY_BASENAME@_fl-@WX_RELEASE@.@WX_TARGET_LIBRARY_TYPE@ - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).o - -include $(top_builddir)/src/makeprog.env diff --git a/contrib/samples/fl/fl_sample3/fl_demo.dsp b/contrib/samples/fl/fl_sample3/fl_demo.dsp deleted file mode 100644 index aa8c788a10..0000000000 --- a/contrib/samples/fl/fl_sample3/fl_demo.dsp +++ /dev/null @@ -1,175 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fl_sample3" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=fl_sample3 - Win32 Debug DLL -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_sample3 - Win32 Debug DLL" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fl_sample3 - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample3 - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample3 - Win32 Debug DLL" (based on "Win32 (x86) Application") -!MESSAGE "fl_sample3 - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fl_sample3 - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Debug DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug_DLL" -# PROP BASE Intermediate_Dir "Debug_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "DebugDll" -# PROP Intermediate_Dir "DebugDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswd" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdlld" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250d.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fldlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib" - -!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Release DLL" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release_DLL" -# PROP BASE Intermediate_Dir "Release_DLL" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleaseDll" -# PROP Intermediate_Dir "ReleaseDll" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/msw" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /I "../../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "WXUSINGDLL" /D "WXUSING_FL_DLL" /YX /FD /D BMP_DIR=\"../bitmaps/\" /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fldll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib" - -!ENDIF - -# Begin Target - -# Name "fl_sample3 - Win32 Release" -# Name "fl_sample3 - Win32 Debug" -# Name "fl_sample3 - Win32 Debug DLL" -# Name "fl_sample3 - Win32 Release DLL" -# Begin Source File - -SOURCE=.\fl_sample3.cpp - -!IF "$(CFG)" == "fl_sample3 - Win32 Release" - -!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Debug" - -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Debug DLL" - -# ADD BASE CPP /Yc"wx/wxprec.h" -# ADD CPP /Yc"wx/wxprec.h" - -!ELSEIF "$(CFG)" == "fl_sample3 - Win32 Release DLL" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=.\fl_sample3.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../../include" -# End Source File -# End Target -# End Project diff --git a/contrib/samples/fl/fl_sample3/fl_demo.dsw b/contrib/samples/fl/fl_sample3/fl_demo.dsw deleted file mode 100644 index 573f82b017..0000000000 --- a/contrib/samples/fl/fl_sample3/fl_demo.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "fl_sample3"=.\fl_demo.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/contrib/samples/fl/fl_sample3/fl_sample3.cpp b/contrib/samples/fl/fl_sample3/fl_sample3.cpp deleted file mode 100644 index 2cdde9fbf3..0000000000 --- a/contrib/samples/fl/fl_sample3/fl_sample3.cpp +++ /dev/null @@ -1,337 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: fl_sample3.cpp -// Purpose: Contrib. demo -// Author: Aleksandras Gluchovas -// Modified by: Sebastian Haase (June 21, 2001) -// Created: 24/11/98 -// RCS-ID: $Id$ -// Copyright: (c) Aleksandras Gluchovas -// Licence: wxWindows license -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx/wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif - -#include "wx/textctrl.h" - -// fl headers -#include "wx/fl/controlbar.h" - -// plugins used -#include "wx/fl/barhintspl.h" -#include "wx/fl/hintanimpl.h" - -#define ID_LOAD 102 -#define ID_STORE 103 -#define ID_QUIT 104 - -#define ID_BUTT 145 -#define ID_BUTT2 146 - -class MyApp: public wxApp -{ -public: - bool OnInit(void); -}; - -class MyFrame: public wxFrame -{ -protected: - wxFrameLayout* mpLayout; - wxWindow* mpClientWnd; - - wxButton * my_butt; - - wxTextCtrl* CreateTextCtrl( const wxString& value ); -public: - MyFrame( wxWindow* parent, char *title ); - ~MyFrame(); - - void OnLoad( wxCommandEvent& event ); - void OnStore( wxCommandEvent& event ); - void OnQuit( wxCommandEvent& event ); - - void OnButt( wxCommandEvent& event ); - void OnButt2( wxCommandEvent& event ); - bool OnClose(void) { return TRUE; } - - DECLARE_EVENT_TABLE() -}; - -/***** Implementation for class MyApp *****/ - -IMPLEMENT_APP (MyApp) - -bool MyApp::OnInit(void) -{ - // wxWindows boiler-plate: - - MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample"); - - wxMenu *file_menu = new wxMenu; - - file_menu->Append( ID_LOAD, "&Load layout" ); - file_menu->Append( ID_STORE, "&Store layout" ); - file_menu->AppendSeparator(); - - file_menu->Append( ID_QUIT, "E&xit" ); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, "&File"); - - frame->CreateStatusBar(3); - frame->SetMenuBar(menu_bar); - - frame->Show(TRUE); - SetTopWindow(frame); - - return TRUE; -} - -/***** Immlementation for class MyFrame *****/ - -BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU( ID_LOAD, MyFrame::OnLoad ) - EVT_MENU( ID_STORE, MyFrame::OnStore ) - EVT_MENU( ID_QUIT, MyFrame::OnQuit ) - EVT_BUTTON( ID_BUTT, MyFrame::OnButt ) - EVT_BUTTON( ID_BUTT2, MyFrame::OnButt2 ) -END_EVENT_TABLE() - -MyFrame::MyFrame( wxWindow* parent, char *title ) - : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition, - wxSize( 700, 500 ), - wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | - wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION, - "freimas" ) -{ - - mpClientWnd = new wxWindow(this, -1); - mpLayout = new wxFrameLayout( this, mpClientWnd ); - - /// mpLayout->PushDefaultPlugins(); - /// mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for barso - /// //mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) ); - - cbDimInfo sizes( 80,65, // when docked horizontally - 80,165, // when docked vertically - 180,30, // when floated - TRUE, // the bar is fixed-size - 5, // vertical gap (bar border) - 5 // horizontal gap (bar border) - ); - - - // drop-in some bars - - for( int i = 1; i <= 11; ++i ) - { - char buf[4]; - sprintf( buf, "%d", i ); - wxString name = wxString("Bar-"); - name += buf; - - sizes.mIsFixed = (i !=3); // every fifth bar is not fixed-size - - if ( !sizes.mIsFixed ) name += " (flexible)"; - // mpLayout->AddBar( CreateTextCtrl(name),// bar window - if(i != 4 && i!= 5 && i!=11) { - mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window - sizes, - i % MAX_PANES,// alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - name // name to refere in customization pop-ups - ); - } else if(i==4){ - mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window - cbDimInfo( 100,100, 100,100, 100,100, TRUE, 5, 5), - i % MAX_PANES,// alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - name // name to refere in customization pop-ups - ); - } else if(i==5) { - my_butt = new wxButton(this, ID_BUTT, name); - mpLayout->AddBar( my_butt,// bar window - cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), - i % MAX_PANES,// alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - name // name to refere in customization pop-ups - ); - } else if(i==11) { - mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+"_2"), - cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), - i % MAX_PANES,// alignment ( 0-top,1-bottom, etc) - 0, // insert into 0th row (vert. position) - 0, // offset from the start of row (in pixels) - name // name to refere in customization pop-ups - ); - } - - // mpLayout->RecalcLayout(true); - // Layout(); - // Refresh(); - } -} - -MyFrame::~MyFrame() -{ - // layout is not a window, should be released manually - if ( mpLayout ) - delete mpLayout; -} - -wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value ) -{ - wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, - wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE ); - - pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) ); - - return pCtrl; -} - -void MyFrame::OnLoad( wxCommandEvent& event ) -{ - wxMessageBox("Hey - you found a BIG question-mark !!"); -} - -void MyFrame::OnStore( wxCommandEvent& event ) -{ - wxMessageBox("Hey - you found another BIG question-mark !!"); -} - -void MyFrame::OnQuit( wxCommandEvent& event ) -{ - Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction - - Close(TRUE); -} - -void MyFrame::OnButt( wxCommandEvent& event ) -{ - static int i =0; - - // cbBarInfo* FindBarByName( const wxString& name ); - - switch(i % 2) { - case 0: - { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1")); - if(x) - mpLayout->InverseVisibility(x); - else - wxBell(); - break; - } - case 1: - { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-6")); - if(x) - { - if(i % 4 == 1) - { - mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); - //mpLayout->RecalcLayout(true); - mpLayout->RepositionFloatedBar(x); - } - else - { - mpLayout->SetBarState(x, 0, TRUE); - //mpLayout->RecalcLayout(true); - //mpLayout->RepositionFloatedBar(x); - } - // // // x->mState = wxCBAR_FLOATING; - // // // mpLayout->ApplyBarProperties(x); - } - else - { - wxBell(); - } - - break; - } - } - i++; -} - -void MyFrame::OnButt2( wxCommandEvent& event ) -{ - static int i =0; - - // cbBarInfo* FindBarByName( const wxString& name ); - - switch(i % 2) { - case 0: - { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1")); - if(x) - { - for(int a=0;amDimInfo.mSizes[a].x = 200; - x->mDimInfo.mSizes[a].y = 200; - } - x->mpBarWnd->SetSize(200,200); - mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); // HACK !!! - mpLayout->SetBarState(x, 0, TRUE); // HACK !!! - wxYield(); // HACK !!! needed to resize BEFORE redraw - mpLayout->RefreshNow( TRUE ); // HACK !!! needed to trigger redraw - } - else - { - wxBell(); - } - - break; - } - case 1: - { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1")); - if(x) - { - //mpLayout->InverseVisibility(x); - for(int a=0;amDimInfo.mSizes[a].x = 10 + 2 + 2*x->mDimInfo.mHorizGap; - x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap; - } - x->mpBarWnd->SetSize(10,10); - mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); // HACK !!! - mpLayout->SetBarState(x, 0, TRUE); // HACK !!! - wxYield(); // HACK !!! needed to resize BEFORE redraw - mpLayout->RefreshNow( TRUE ); // HACK !!! needed to trigger redraw - - // // mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); - // // mpLayout->RecalcLayout(true); - // // // mpLayout->RepositionFloatedBar(x); - // // mpLayout->RecalcLayout(true); - // // mpLayout->RepositionFloatedBar(x); - // // mpLayout->SetBarState(x, 0, TRUE); - // // wxYield(); - // // mpLayout->RefreshNow( TRUE ); - // // mpLayout->RecalcLayout(true); - } - else - { - wxBell(); - } - - break; - } - } - i++; -} - diff --git a/contrib/samples/fl/fl_sample3/fl_sample3.rc b/contrib/samples/fl/fl_sample3/fl_sample3.rc deleted file mode 100644 index 626b82f58a..0000000000 --- a/contrib/samples/fl/fl_sample3/fl_sample3.rc +++ /dev/null @@ -1,3 +0,0 @@ -/* mondrian ICON "mondrian.ico" */ -#include "wx/msw/wx.rc" - diff --git a/contrib/samples/fl/fl_sample3/makefile.b32 b/contrib/samples/fl/fl_sample3/makefile.b32 deleted file mode 100644 index d243c38bef..0000000000 --- a/contrib/samples/fl/fl_sample3/makefile.b32 +++ /dev/null @@ -1,23 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds sample for 32-bit BC++ - -WXDIR = ..\..\..\.. -TARGET = fl_sample3 - -EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\" -!if "$(FINAL)" == "1" -EXTRALIBS = $(WSLIBDIR)\fl.lib -!else -EXTRALIBS = $(WSLIBDIR)\fld.lib -!endif - -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.b32 - diff --git a/contrib/samples/fl/fl_sample3/makefile.g95 b/contrib/samples/fl/fl_sample3/makefile.g95 deleted file mode 100644 index 47e00c3722..0000000000 --- a/contrib/samples/fl/fl_sample3/makefile.g95 +++ /dev/null @@ -1,18 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile for wxWorkshop for mingw & cygwin. - -WXDIR = ../../../.. -TARGET = fl_sample3 - -EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\" -EXTRALIBS = $(WXDIR)/lib/libfl.a - -OBJECTS = $(TARGET).o - -include $(WXDIR)/src/makeprog.g95 diff --git a/contrib/samples/fl/fl_sample3/makefile.vc b/contrib/samples/fl/fl_sample3/makefile.vc deleted file mode 100644 index d63277a77a..0000000000 --- a/contrib/samples/fl/fl_sample3/makefile.vc +++ /dev/null @@ -1,38 +0,0 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile : Builds fl sample (VC++, WIN32) -# Use FINAL=1 argument to nmake to build final version with no debug info. - -WXDIR = ..\..\..\.. -TARGET = fl_sample3 - -EXTRAINC = -DBMP_DIR=\"../bitmaps/\" - -!if "$(WXUSING_FL_DLL)" == "1" -# Define WXUSING_FL_DLL so the compiler knows it is set. -EXTRAINC = $(EXTRAINC) -DWXUSING_FL_DLL -# Set to use wxWin in DLL format... -WXUSINGDLL = 1 - -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fldll.lib -!else -EXTRALIBS = $(WXDIR)\lib\fldlld.lib -!endif -!else -!if "$(FINAL)" == "1" -EXTRALIBS = $(WXDIR)\lib\fl.lib -!else -EXTRALIBS = $(WXDIR)\lib\fld.lib -!endif -!endif - -PROGRAM = $(TARGET) -OBJECTS = $(TARGET).obj - -!include $(WXDIR)\src\makeprog.vc