From f2d0790b1a14b530531f5f6cfc269107f796aba2 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Sat, 1 Dec 2001 14:52:00 +0000 Subject: [PATCH] Applied #487077: updates/fixes for BCC32 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/html/makefile.b32 | 16 ++-- samples/ipc/makefile.b32 | 4 +- samples/makefile.b32 | 164 ++++++++++++++++++++++------------ samples/proplist/proplist.cpp | 14 ++- samples/tab/tab.cpp | 6 +- 5 files changed, 133 insertions(+), 71 deletions(-) diff --git a/samples/html/makefile.b32 b/samples/html/makefile.b32 index f4ce300786..92d00e3d9d 100644 --- a/samples/html/makefile.b32 +++ b/samples/html/makefile.b32 @@ -18,21 +18,21 @@ THISDIR=$(WXDIR)\samples all: cd $(WXDIR)\samples\html\about - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\help - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\helpview - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\printing - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\test - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\virtual - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\widget - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\html\zip - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) clean: cd $(WXDIR)\samples\html\about diff --git a/samples/ipc/makefile.b32 b/samples/ipc/makefile.b32 index b9aac16acc..3726873704 100644 --- a/samples/ipc/makefile.b32 +++ b/samples/ipc/makefile.b32 @@ -8,8 +8,8 @@ # Makefile : Builds sample for 32-bit BC++ all: - make -f server.b32 all - make -f client.b32 all + make -f server.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) all + make -f client.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) all clean: make -f server.b32 clean diff --git a/samples/makefile.b32 b/samples/makefile.b32 index 3c65c8e7b5..8abf6fb577 100644 --- a/samples/makefile.b32 +++ b/samples/makefile.b32 @@ -27,135 +27,160 @@ NOMAKE=1 COMPIL=1 # Need PNG PNGSETUP= +# Need wxUSE_ODBC; define this to compile db sample +ODBCSETUP= + # # Please keep samples list up-to-date, in alphabetical order -# +# not alphabetically organised ; 29 Nov 01 all: cd $(WXDIR)\samples\calendar - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\caret - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\checklst - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\config - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\controls - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) +!if "$(ODBCSETUP)"=="1" cd $(WXDIR)\samples\db - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) +!endif cd $(WXDIR)\samples\ipc - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\dialogs - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\dnd - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\docview - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\docvwmdi - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\drawing - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\dynamic - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\font - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\grid - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\newgrid - make -f makefile.b32 FINAL=$(FINAL) -!if "$(COMPIL)"=="" + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\help - make -f makefile.b32 FINAL=$(FINAL) -!endif + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + !if "$(PNGSETUP)"=="" cd $(WXDIR)\samples\html - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !endif cd $(WXDIR)\samples\image - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\internat - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\joytest - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\layout - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\listctrl - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\mdi - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\menu - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !if "$(FINAL)" == "0" cd $(WXDIR)\samples\memcheck - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !endif !if "$(COMPIL)"=="" cd $(WXDIR)\samples\mfc - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !endif cd $(WXDIR)\samples\minifram - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\minimal - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\nativdlg - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !if "$(COMPIL)"=="" cd $(WXDIR)\samples\dialup - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !endif cd $(WXDIR)\samples\notebook - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\oleauto - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\ownerdrw - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\png - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\printing - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\proplist - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\regtest - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\resource - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !if "$(COMPIL)"=="" cd $(WXDIR)\samples\richedit - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !endif cd $(WXDIR)\samples\rotate - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\sashtest - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\scroll - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\scrollsub - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\splitter - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !if "$(COMPIL)"=="" cd $(WXDIR)\samples\tab - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) !endif cd $(WXDIR)\samples\taskbar - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\text - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\thread - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\toolbar - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\treectrl - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\typetest - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\validate - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\wizard - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\dragimag + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\exec + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\richedit + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\statbar + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) cd $(WXDIR)\samples\sockets - make -f makefile.b32 FINAL=$(FINAL) + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\widgets + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\tab + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\treelay + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\erase + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\event + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) + cd $(WXDIR)\samples\propsize + make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) clean: cd $(WXDIR)\samples\calendar @@ -270,6 +295,29 @@ clean: cd $(WXDIR)\samples\wizard make -f makefile.b32 clean !endif + cd $(WXDIR)\samples\dragimag + make -f makefile.b32 clean + cd $(WXDIR)\samples\erase + make -f makefile.b32 clean + cd $(WXDIR)\samples\exec + make -f makefile.b32 clean + cd $(WXDIR)\samples\event + make -f makefile.b32 clean + cd $(WXDIR)\samples\statbar + make -f makefile.b32 clean + cd $(WXDIR)\samples\richedit + make -f makefile.b32 clean + cd $(WXDIR)\samples\propsize + make -f makefile.b32 clean + cd $(WXDIR)\samples\sockets make -f makefile.b32 clean + cd $(WXDIR)\samples\treelay + make -f makefile.b32 clean + cd $(WXDIR)\samples\treectrl + make -f makefile.b32 clean + cd $(WXDIR)\samples\tab + make -f makefile.b32 clean + cd $(WXDIR)\samples\widgets + make -f makefile.b32 clean diff --git a/samples/proplist/proplist.cpp b/samples/proplist/proplist.cpp index ab4dffc53b..af8c22b74e 100644 --- a/samples/proplist/proplist.cpp +++ b/samples/proplist/proplist.cpp @@ -237,8 +237,18 @@ void MyApp::PropertyFormTest(bool useDialog) propFrame->Initialize(); m_childWindow = propFrame; } - - wxWindow *panel = propDialog ? propDialog : propFrame->GetPropertyPanel(); + + // BCC32 does not like ?: + wxWindow *panel ; + if ( propDialog ) + { + panel = propDialog ; + } + else + { + panel = propFrame->GetPropertyPanel() ; + } + wxLayoutConstraints* c; #if 0 diff --git a/samples/tab/tab.cpp b/samples/tab/tab.cpp index 13d24ec506..c581ac1760 100644 --- a/samples/tab/tab.cpp +++ b/samples/tab/tab.cpp @@ -23,6 +23,10 @@ #include "wx/tab.h" #include "tab.h" +#if wxUSE_TAB_DIALOG == 0 +#error "wxUSE_TAB_DIALOG must be defined as 1 in setup.h." +#endif + // If 1, use a dialog. Otherwise use a frame. #define USE_TABBED_DIALOG 1 @@ -166,7 +170,7 @@ void MyDialog::Init(void) // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match // with the panel background, and save a bit of time. - wxPanelTabView *view = new wxPanelTabView(this, wxTAB_STYLE_DRAW_BOX); + wxPanelTabView *view = new wxPanelTabView((wxPanel *)this, wxTAB_STYLE_DRAW_BOX); wxGetApp().InitTabView(view, this); -- 2.45.2