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

Applied #487077: updates/fixes for BCC32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2001-12-01 14:52:00 +00:00
parent f1104df133
commit f2d0790b1a
5 changed files with 144 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/html/makefile.b32
View File

@@ -18,21 +18,21 @@ THISDIR=$(WXDIR)\samples
all: all:
cd $(WXDIR)\samples\html\about cd $(WXDIR)\samples\html\about
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\help cd $(WXDIR)\samples\html\help
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\helpview cd $(WXDIR)\samples\html\helpview
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\printing cd $(WXDIR)\samples\html\printing
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\test cd $(WXDIR)\samples\html\test
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\virtual cd $(WXDIR)\samples\html\virtual
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\widget cd $(WXDIR)\samples\html\widget
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\html\zip cd $(WXDIR)\samples\html\zip
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
clean: clean:
cd $(WXDIR)\samples\html\about cd $(WXDIR)\samples\html\about

4
samples/ipc/makefile.b32
View File

@@ -8,8 +8,8 @@
# Makefile : Builds sample for 32-bit BC++ # Makefile : Builds sample for 32-bit BC++
all: all:
make -f server.b32 all make -f server.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) all
make -f client.b32 all make -f client.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) all
clean: clean:
make -f server.b32 clean make -f server.b32 clean

186
samples/makefile.b32
View File

@@ -27,135 +27,160 @@ NOMAKE=1
COMPIL=1 COMPIL=1
# Need PNG # Need PNG
PNGSETUP= PNGSETUP=
# Need wxUSE_ODBC; define this to compile db sample
ODBCSETUP=
# #
# Please keep samples list up-to-date, in alphabetical order # Please keep samples list up-to-date, in alphabetical order
# # not alphabetically organised ; 29 Nov 01
all: all:
cd $(WXDIR)\samples\calendar cd $(WXDIR)\samples\calendar
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\caret cd $(WXDIR)\samples\caret
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\checklst cd $(WXDIR)\samples\checklst
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\config cd $(WXDIR)\samples\config
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\controls 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 cd $(WXDIR)\samples\db
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\ipc
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dnd
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\docview
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\docvwmdi
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\drawing
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dynamic
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\font
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\grid
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\newgrid
make -f makefile.b32 FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\help
make -f makefile.b32 FINAL=$(FINAL)
!endif !endif
cd $(WXDIR)\samples\ipc
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\dialogs
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\dnd
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\docview
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\docvwmdi
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\drawing
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\dynamic
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\font
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\grid
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\newgrid
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\help
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!if "$(PNGSETUP)"=="" !if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif !endif
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\internat cd $(WXDIR)\samples\internat
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\layout cd $(WXDIR)\samples\layout
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\listctrl cd $(WXDIR)\samples\listctrl
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\mdi cd $(WXDIR)\samples\mdi
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\menu cd $(WXDIR)\samples\menu
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif !endif
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\mfc cd $(WXDIR)\samples\mfc
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif !endif
cd $(WXDIR)\samples\minifram cd $(WXDIR)\samples\minifram
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\minimal cd $(WXDIR)\samples\minimal
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\nativdlg
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\dialup cd $(WXDIR)\samples\dialup
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif !endif
cd $(WXDIR)\samples\notebook cd $(WXDIR)\samples\notebook
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\oleauto cd $(WXDIR)\samples\oleauto
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\ownerdrw cd $(WXDIR)\samples\ownerdrw
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\regtest cd $(WXDIR)\samples\regtest
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\richedit cd $(WXDIR)\samples\richedit
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif !endif
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\scrollsub cd $(WXDIR)\samples\scrollsub
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\splitter
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!if "$(COMPIL)"=="" !if "$(COMPIL)"==""
cd $(WXDIR)\samples\tab cd $(WXDIR)\samples\tab
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif !endif
cd $(WXDIR)\samples\taskbar cd $(WXDIR)\samples\taskbar
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\text cd $(WXDIR)\samples\text
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\thread cd $(WXDIR)\samples\thread
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\toolbar cd $(WXDIR)\samples\toolbar
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\treectrl cd $(WXDIR)\samples\treectrl
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\typetest cd $(WXDIR)\samples\typetest
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\validate cd $(WXDIR)\samples\validate
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\wizard 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 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: clean:
cd $(WXDIR)\samples\calendar cd $(WXDIR)\samples\calendar
@@ -270,6 +295,29 @@ clean:
cd $(WXDIR)\samples\wizard cd $(WXDIR)\samples\wizard
make -f makefile.b32 clean make -f makefile.b32 clean
!endif !endif
cd $(WXDIR)\samples\sockets 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 make -f makefile.b32 clean

12
samples/proplist/proplist.cpp
View File

@@ -238,7 +238,17 @@ void MyApp::PropertyFormTest(bool useDialog)
m_childWindow = propFrame; 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; wxLayoutConstraints* c;
#if 0 #if 0

6
samples/tab/tab.cpp
View File

@@ -23,6 +23,10 @@
#include "wx/tab.h" #include "wx/tab.h"
#include "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. // If 1, use a dialog. Otherwise use a frame.
#define USE_TABBED_DIALOG 1 #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 // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
// with the panel background, and save a bit of time. // 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); wxGetApp().InitTabView(view, this);