renamed CodeWarrior 5 projects (added new ones as well)

added CarbonAccessors.o to Classic targets
corrected link warnings/errors in Carbon targets

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/calendar/.cvsignore b/samples/calendar/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..89443e255ec4ba7a8870333ce47370be9c2e1bd5 100644 (file)
--- a/samples/calendar/.cvsignore
+++ b/samples/calendar/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+CalendarM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/calendar/CalendarM5.mcp b/samples/calendar/CalendarM5.mcp
new file mode 100644 (file)
index 0000000..433e3b1
Binary files /dev/null and b/samples/calendar/CalendarM5.mcp differ

diff --git a/samples/calendar/makemac.mcp b/samples/calendar/makemac.mcp
deleted file mode 100644 (file)
index ff28882..0000000
Binary files a/samples/calendar/makemac.mcp and /dev/null differ

diff --git a/samples/caret/.cvsignore b/samples/caret/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..82b825cc7c1ecc4ab17a3a1f5191153686a67599 100644 (file)
--- a/samples/caret/.cvsignore
+++ b/samples/caret/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+CaretM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/caret/CaretM5.mcp b/samples/caret/CaretM5.mcp
new file mode 100644 (file)
index 0000000..0bb6d65
Binary files /dev/null and b/samples/caret/CaretM5.mcp differ

diff --git a/samples/caret/makemac.mcp b/samples/caret/makemac.mcp
deleted file mode 100644 (file)
index e6d7d79..0000000
Binary files a/samples/caret/makemac.mcp and /dev/null differ

diff --git a/samples/checklst/.cvsignore b/samples/checklst/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..39b6bf89fa61eabaa1093795f1dde8c9037d2f8e 100644 (file)
--- a/samples/checklst/.cvsignore
+++ b/samples/checklst/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+CheckLstM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/checklst/CheckLstM5.mcp b/samples/checklst/CheckLstM5.mcp
new file mode 100644 (file)
index 0000000..b1c6df0
Binary files /dev/null and b/samples/checklst/CheckLstM5.mcp differ

diff --git a/samples/checklst/makemac.mcp b/samples/checklst/makemac.mcp
deleted file mode 100644 (file)
index 4d7a7f5..0000000
Binary files a/samples/checklst/makemac.mcp and /dev/null differ

diff --git a/samples/config/.cvsignore b/samples/config/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..4415fb554ac86e430b970ac29e423606edf416d9 100644 (file)
--- a/samples/config/.cvsignore
+++ b/samples/config/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+ConfigM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/config/ConfigM5.mcp b/samples/config/ConfigM5.mcp
new file mode 100644 (file)
index 0000000..03ab782
Binary files /dev/null and b/samples/config/ConfigM5.mcp differ

diff --git a/samples/config/makemac.mcp b/samples/config/makemac.mcp
deleted file mode 100644 (file)
index d6342a5..0000000
Binary files a/samples/config/makemac.mcp and /dev/null differ

diff --git a/samples/controls/.cvsignore b/samples/controls/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..7731a9ecf88a44a203d64d82c2564699247b8b5f 100644 (file)
--- a/samples/controls/.cvsignore
+++ b/samples/controls/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+ControlsM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/controls/ControlsM5.mcp b/samples/controls/ControlsM5.mcp
new file mode 100644 (file)
index 0000000..5e83727
Binary files /dev/null and b/samples/controls/ControlsM5.mcp differ

diff --git a/samples/controls/makemac.mcp b/samples/controls/makemac.mcp
deleted file mode 100644 (file)
index bb8f042..0000000
Binary files a/samples/controls/makemac.mcp and /dev/null differ

diff --git a/samples/db/.cvsignore b/samples/db/.cvsignore
index 1ae4f5005ee41895bf76c7ce0db3b0789de19506..ed14234340a7af15ac542f260932c477a98363b4 100644 (file)
--- a/samples/db/.cvsignore
+++ b/samples/db/.cvsignore
@@ -1,2 +1,6 @@
 database.cfg
-makemac?Data
+DbM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/db/DbM5.mcp b/samples/db/DbM5.mcp
new file mode 100644 (file)
index 0000000..6b4088b
Binary files /dev/null and b/samples/db/DbM5.mcp differ

diff --git a/samples/dialogs/.cvsignore b/samples/dialogs/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..a27b78874f09db3b5fc648926fef268a5731ad8c 100644 (file)
--- a/samples/dialogs/.cvsignore
+++ b/samples/dialogs/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+DialogsM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/dialogs/DialogsM5.mcp b/samples/dialogs/DialogsM5.mcp
new file mode 100644 (file)
index 0000000..dd5823e
Binary files /dev/null and b/samples/dialogs/DialogsM5.mcp differ

diff --git a/samples/dialogs/makemac.mcp b/samples/dialogs/makemac.mcp
deleted file mode 100644 (file)
index 7ef9302..0000000
Binary files a/samples/dialogs/makemac.mcp and /dev/null differ

diff --git a/samples/dialup/.cvsignore b/samples/dialup/.cvsignore
index 451fa3224c32dac89617f85b46691efb6cff7b5d..78ba3c5e75e2723eab8f2305cdd9a5d4ac9abfae 100644 (file)
--- a/samples/dialup/.cvsignore
+++ b/samples/dialup/.cvsignore
@@ -1 +1,5 @@
-makemac?Data
+DialupM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/dnd/.cvsignore b/samples/dnd/.cvsignore
index 451fa3224c32dac89617f85b46691efb6cff7b5d..aee251ffd06037aa9debd267bb80b178cb506a7d 100644 (file)
--- a/samples/dnd/.cvsignore
+++ b/samples/dnd/.cvsignore
@@ -1 +1,5 @@
-makemac?Data
+DndM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/dnd/DndM5.mcp b/samples/dnd/DndM5.mcp
new file mode 100644 (file)
index 0000000..37afc97
Binary files /dev/null and b/samples/dnd/DndM5.mcp differ

diff --git a/samples/dnd/makemac.mcp b/samples/dnd/makemac.mcp
deleted file mode 100644 (file)
index f888796..0000000
Binary files a/samples/dnd/makemac.mcp and /dev/null differ

diff --git a/samples/docview/.cvsignore b/samples/docview/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..d0c78b5f10c4e5ae01d8df27cc97352d8550206c 100644 (file)
--- a/samples/docview/.cvsignore
+++ b/samples/docview/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+DocViewM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/docview/DocViewM5.mcp b/samples/docview/DocViewM5.mcp
new file mode 100644 (file)
index 0000000..1e19b11
Binary files /dev/null and b/samples/docview/DocViewM5.mcp differ

diff --git a/samples/docview/makemac.mcp b/samples/docview/makemac.mcp
deleted file mode 100644 (file)
index 58e46e9..0000000
Binary files a/samples/docview/makemac.mcp and /dev/null differ

diff --git a/samples/docvwmdi/.cvsignore b/samples/docvwmdi/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..8d2a5f76cdd35f64c8c113a5cf1b8a8205abd73a 100644 (file)
--- a/samples/docvwmdi/.cvsignore
+++ b/samples/docvwmdi/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+DocVwMDIM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/docvwmdi/DocVwMDIM5.mcp b/samples/docvwmdi/DocVwMDIM5.mcp
new file mode 100644 (file)
index 0000000..945abcf
Binary files /dev/null and b/samples/docvwmdi/DocVwMDIM5.mcp differ

diff --git a/samples/docvwmdi/makemac.mcp b/samples/docvwmdi/makemac.mcp
deleted file mode 100644 (file)
index 46eff75..0000000
Binary files a/samples/docvwmdi/makemac.mcp and /dev/null differ

diff --git a/samples/dragimag/.cvsignore b/samples/dragimag/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..74fe9cb05be1937c9141957ccf800463fc4d96dc 100644 (file)
--- a/samples/dragimag/.cvsignore
+++ b/samples/dragimag/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+Dragimag*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/dragimag/DragimagM5.mcp b/samples/dragimag/DragimagM5.mcp
new file mode 100644 (file)
index 0000000..df88c19
Binary files /dev/null and b/samples/dragimag/DragimagM5.mcp differ

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index fd7d182c44af00dbbefdbd312c04091c246f3b25..a0732462dc90a57f831cf322c45caa7dea64d9fc 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -183,7 +183,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
                 }
                 case SHAPE_DRAG_TEXT:
                 {
-                    m_dragImage = new wxDragImage("Dragging some test text", wxCursor(wxCURSOR_HAND));
+                    m_dragImage = new wxDragImage(wxString("Dragging some test text"), wxCursor(wxCURSOR_HAND));
                     break;
                 }
                 case SHAPE_DRAG_ICON:

diff --git a/samples/dragimag/makemac.mcp b/samples/dragimag/makemac.mcp
deleted file mode 100644 (file)
index 9e6873f..0000000
Binary files a/samples/dragimag/makemac.mcp and /dev/null differ

diff --git a/samples/drawing/.cvsignore b/samples/drawing/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..9a7a24bd4a85587a5587fa5cd074917d59e60ab7 100644 (file)
--- a/samples/drawing/.cvsignore
+++ b/samples/drawing/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+DrawingM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/drawing/DrawingM5.mcp b/samples/drawing/DrawingM5.mcp
new file mode 100644 (file)
index 0000000..e98974f
Binary files /dev/null and b/samples/drawing/DrawingM5.mcp differ

diff --git a/samples/drawing/makemac.mcp b/samples/drawing/makemac.mcp
deleted file mode 100644 (file)
index 5cb672c..0000000
Binary files a/samples/drawing/makemac.mcp and /dev/null differ

diff --git a/samples/dynamic/.cvsignore b/samples/dynamic/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..052a7bbbc0cfc0309f06461193d35e54096649fc 100644 (file)
--- a/samples/dynamic/.cvsignore
+++ b/samples/dynamic/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+DynamicM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/dynamic/DynamicM5.mcp b/samples/dynamic/DynamicM5.mcp
new file mode 100644 (file)
index 0000000..c08929b
Binary files /dev/null and b/samples/dynamic/DynamicM5.mcp differ

diff --git a/samples/dynamic/makemac.mcp b/samples/dynamic/makemac.mcp
deleted file mode 100644 (file)
index fbaf9a1..0000000
Binary files a/samples/dynamic/makemac.mcp and /dev/null differ

diff --git a/samples/erase/.cvsignore b/samples/erase/.cvsignore
new file mode 100644 (file)
index 0000000..586c531
--- /dev/null
+++ b/samples/erase/.cvsignore
@@ -0,0 +1,5 @@
+EraseM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/erase/EraseM5.mcp b/samples/erase/EraseM5.mcp
new file mode 100644 (file)
index 0000000..1f6d5ec
Binary files /dev/null and b/samples/erase/EraseM5.mcp differ

diff --git a/samples/event/.cvsignore b/samples/event/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..652484e7089b6f1269641692546eee7b506f328c 100644 (file)
--- a/samples/event/.cvsignore
+++ b/samples/event/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+EventM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/event/EventM5.mcp b/samples/event/EventM5.mcp
new file mode 100644 (file)
index 0000000..e1b773d
Binary files /dev/null and b/samples/event/EventM5.mcp differ

diff --git a/samples/event/makemac.mcp b/samples/event/makemac.mcp
deleted file mode 100644 (file)
index 502bd0b..0000000
Binary files a/samples/event/makemac.mcp and /dev/null differ

diff --git a/samples/exec/.cvsignore b/samples/exec/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..7828f92a272df0c07afeb090b535ebf9459023be 100644 (file)
--- a/samples/exec/.cvsignore
+++ b/samples/exec/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+ExecM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/exec/ExecM5.mcp b/samples/exec/ExecM5.mcp
new file mode 100644 (file)
index 0000000..08f391c
Binary files /dev/null and b/samples/exec/ExecM5.mcp differ

diff --git a/samples/exec/makemac.mcp b/samples/exec/makemac.mcp
deleted file mode 100644 (file)
index ace2009..0000000
Binary files a/samples/exec/makemac.mcp and /dev/null differ

diff --git a/samples/font/.cvsignore b/samples/font/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..bb50d07ecea4cd3f87e9173a494f1582b792e423 100644 (file)
--- a/samples/font/.cvsignore
+++ b/samples/font/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+FontM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/font/FontM5.mcp b/samples/font/FontM5.mcp
new file mode 100644 (file)
index 0000000..22fb4cf
Binary files /dev/null and b/samples/font/FontM5.mcp differ

diff --git a/samples/font/makemac.mcp b/samples/font/makemac.mcp
deleted file mode 100644 (file)
index 0e0aba0..0000000
Binary files a/samples/font/makemac.mcp and /dev/null differ

diff --git a/samples/grid/.cvsignore b/samples/grid/.cvsignore
index 232eceefa0e4ad991b48dac75340912007e1e2f2..df78bbd5f4dd5d382d31440bd1ffafd73652ddfe 100644 (file)
--- a/samples/grid/.cvsignore
+++ b/samples/grid/.cvsignore
@@ -1,4 +1,5 @@
-Makefile.in
-makemac?Data
-PPC?Debug*
-PPC?Release*
+GridM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/grid/GridM5.mcp b/samples/grid/GridM5.mcp
new file mode 100644 (file)
index 0000000..3fc7e70
Binary files /dev/null and b/samples/grid/GridM5.mcp differ

diff --git a/samples/grid/makemac.mcp b/samples/grid/makemac.mcp
deleted file mode 100644 (file)
index ffaaedb..0000000
Binary files a/samples/grid/makemac.mcp and /dev/null differ

diff --git a/samples/help/.cvsignore b/samples/help/.cvsignore
index 40b9b6284073fb21571f5b78188711879b77773a..d4e23a29e5de7e4a3513616fecdcaf3722b23a98 100644 (file)
--- a/samples/help/.cvsignore
+++ b/samples/help/.cvsignore
@@ -1,3 +1,5 @@
-Makefile.in
-makemac?Data
-PPC?Debug*
+HelpM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/help/HelpM5.mcp b/samples/help/HelpM5.mcp
new file mode 100644 (file)
index 0000000..2b4c5e8
Binary files /dev/null and b/samples/help/HelpM5.mcp differ

diff --git a/samples/help/makemac.mcp b/samples/help/makemac.mcp
deleted file mode 100644 (file)
index d97ca5d..0000000
Binary files a/samples/help/makemac.mcp and /dev/null differ

diff --git a/samples/html/about/.cvsignore b/samples/html/about/.cvsignore
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..193a62f43e90342739d87fed89b06a6c16eebb9d 100644 (file)
--- a/samples/html/about/.cvsignore
+++ b/samples/html/about/.cvsignore
@@ -0,0 +1,5 @@
+AboutM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/about/AboutM5.mcp b/samples/html/about/AboutM5.mcp
new file mode 100644 (file)
index 0000000..7b6b3fa
Binary files /dev/null and b/samples/html/about/AboutM5.mcp differ

diff --git a/samples/html/help/.cvsignore b/samples/html/help/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..d4e23a29e5de7e4a3513616fecdcaf3722b23a98 100644 (file)
--- a/samples/html/help/.cvsignore
+++ b/samples/html/help/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+HelpM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/html/help/HelpM5.mcp b/samples/html/help/HelpM5.mcp
new file mode 100644 (file)
index 0000000..a05568b
Binary files /dev/null and b/samples/html/help/HelpM5.mcp differ

diff --git a/samples/html/help/makemac.mcp b/samples/html/help/makemac.mcp
deleted file mode 100644 (file)
index 5472dec..0000000
Binary files a/samples/html/help/makemac.mcp and /dev/null differ

diff --git a/samples/html/helpview/.cvsignore b/samples/html/helpview/.cvsignore
new file mode 100644 (file)
index 0000000..47ed31b
--- /dev/null
+++ b/samples/html/helpview/.cvsignore
@@ -0,0 +1,5 @@
+HelpViewM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/helpview/HelpViewM5.mcp b/samples/html/helpview/HelpViewM5.mcp
new file mode 100644 (file)
index 0000000..ac0c5cf
Binary files /dev/null and b/samples/html/helpview/HelpViewM5.mcp differ

diff --git a/samples/html/printing/.cvsignore b/samples/html/printing/.cvsignore
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..da8ad77e3857279c086f115271d6502aae4986be 100644 (file)
--- a/samples/html/printing/.cvsignore
+++ b/samples/html/printing/.cvsignore
@@ -0,0 +1,5 @@
+PrintingM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/printing/PrintingM5.mcp b/samples/html/printing/PrintingM5.mcp
new file mode 100644 (file)
index 0000000..bd38a1b
Binary files /dev/null and b/samples/html/printing/PrintingM5.mcp differ

diff --git a/samples/html/test/.cvsignore b/samples/html/test/.cvsignore
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2b9c4b208358d4e695dc73bcbd2496cfa84de950 100644 (file)
--- a/samples/html/test/.cvsignore
+++ b/samples/html/test/.cvsignore
@@ -0,0 +1,5 @@
+TestM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/test/TestM5.mcp b/samples/html/test/TestM5.mcp
new file mode 100644 (file)
index 0000000..ff66ca1
Binary files /dev/null and b/samples/html/test/TestM5.mcp differ

diff --git a/samples/html/virtual/.cvsignore b/samples/html/virtual/.cvsignore
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ac87afb349a42896013fc06b21034349a5138c08 100644 (file)
--- a/samples/html/virtual/.cvsignore
+++ b/samples/html/virtual/.cvsignore
@@ -0,0 +1,5 @@
+VirtualM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/virtual/VirtualM5.mcp b/samples/html/virtual/VirtualM5.mcp
new file mode 100644 (file)
index 0000000..9de3c70
Binary files /dev/null and b/samples/html/virtual/VirtualM5.mcp differ

diff --git a/samples/html/widget/.cvsignore b/samples/html/widget/.cvsignore
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3cd5cb16069dd9a56091e9d4774926eda794a2b7 100644 (file)
--- a/samples/html/widget/.cvsignore
+++ b/samples/html/widget/.cvsignore
@@ -0,0 +1,5 @@
+WidgetM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/widget/WidgetM5.mcp b/samples/html/widget/WidgetM5.mcp
new file mode 100644 (file)
index 0000000..65305b3
Binary files /dev/null and b/samples/html/widget/WidgetM5.mcp differ

diff --git a/samples/html/zip/.cvsignore b/samples/html/zip/.cvsignore
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0cee6d698e1661e9b6f2609dca0affd53c62ae0b 100644 (file)
--- a/samples/html/zip/.cvsignore
+++ b/samples/html/zip/.cvsignore
@@ -0,0 +1,5 @@
+ZipM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/html/zip/ZipM5.mcp b/samples/html/zip/ZipM5.mcp
new file mode 100644 (file)
index 0000000..8118f4d
Binary files /dev/null and b/samples/html/zip/ZipM5.mcp differ

diff --git a/samples/image/.cvsignore b/samples/image/.cvsignore
index 3e0b9371df9ed951dc56c9eab88eb5adbe208777..c6196b2f18b32fc1a1801ab8ae9e442f88ff7188 100644 (file)
--- a/samples/image/.cvsignore
+++ b/samples/image/.cvsignore
@@ -1,6 +1,6 @@
 test.png
 saved.xpm
-makemac?Data
+ImageM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/image/ImageM5.mcp b/samples/image/ImageM5.mcp
new file mode 100644 (file)
index 0000000..b9fe36a
Binary files /dev/null and b/samples/image/ImageM5.mcp differ

diff --git a/samples/image/makemac.mcp b/samples/image/makemac.mcp
deleted file mode 100644 (file)
index 7b6cf8f..0000000
Binary files a/samples/image/makemac.mcp and /dev/null differ

diff --git a/samples/internat/.cvsignore b/samples/internat/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..8582cd8ef091021b15c76c60da8ba7eb6bd8720d 100644 (file)
--- a/samples/internat/.cvsignore
+++ b/samples/internat/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+InternatM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/internat/InternatM5.mcp b/samples/internat/InternatM5.mcp
new file mode 100644 (file)
index 0000000..da2c814
Binary files /dev/null and b/samples/internat/InternatM5.mcp differ

diff --git a/samples/internat/makemac.mcp b/samples/internat/makemac.mcp
deleted file mode 100644 (file)
index 48d929e..0000000
Binary files a/samples/internat/makemac.mcp and /dev/null differ

diff --git a/samples/ipc/.cvsignore b/samples/ipc/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/samples/ipc/.cvsignore
+++ b/samples/ipc/.cvsignore
@@ -1,2 +0,0 @@
-Makefile.in
-

diff --git a/samples/joytest/.cvsignore b/samples/joytest/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..c9126b5925a50c1766b55eed22e9cb5f24e95534 100644 (file)
--- a/samples/joytest/.cvsignore
+++ b/samples/joytest/.cvsignore
@@ -1,2 +1,5 @@
-Makefile.in
-
+JoytestM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/joytest/JoytestM5.mcp b/samples/joytest/JoytestM5.mcp
new file mode 100644 (file)
index 0000000..443b7cf
Binary files /dev/null and b/samples/joytest/JoytestM5.mcp differ

diff --git a/samples/layout/.cvsignore b/samples/layout/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..ae49b16c174c71eab8d81a0a2a2fe08bcae83137 100644 (file)
--- a/samples/layout/.cvsignore
+++ b/samples/layout/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+LayoutM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/layout/LayoutM5.mcp b/samples/layout/LayoutM5.mcp
new file mode 100644 (file)
index 0000000..3b389ee
Binary files /dev/null and b/samples/layout/LayoutM5.mcp differ

diff --git a/samples/layout/makemac.mcp b/samples/layout/makemac.mcp
deleted file mode 100644 (file)
index 7e3290f..0000000
Binary files a/samples/layout/makemac.mcp and /dev/null differ

diff --git a/samples/listctrl/.cvsignore b/samples/listctrl/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..da79dfdb90978b9caf9928337624af35f2202c71 100644 (file)
--- a/samples/listctrl/.cvsignore
+++ b/samples/listctrl/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+ListctrlM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/listctrl/ListctrlM5.mcp b/samples/listctrl/ListctrlM5.mcp
new file mode 100644 (file)
index 0000000..c37fcc5
Binary files /dev/null and b/samples/listctrl/ListctrlM5.mcp differ

diff --git a/samples/listctrl/makemac.mcp b/samples/listctrl/makemac.mcp
deleted file mode 100644 (file)
index 7d00061..0000000
Binary files a/samples/listctrl/makemac.mcp and /dev/null differ

diff --git a/samples/mdi/.cvsignore b/samples/mdi/.cvsignore
index 451fa3224c32dac89617f85b46691efb6cff7b5d..ada528a13c5f3e62f19e74c249a6d665f5838ba6 100644 (file)
--- a/samples/mdi/.cvsignore
+++ b/samples/mdi/.cvsignore
@@ -1 +1,5 @@
-makemac?Data
+MdiM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/mdi/MdiM5.mcp b/samples/mdi/MdiM5.mcp
new file mode 100644 (file)
index 0000000..976bd1f
Binary files /dev/null and b/samples/mdi/MdiM5.mcp differ

diff --git a/samples/mdi/makemac.mcp b/samples/mdi/makemac.mcp
deleted file mode 100644 (file)
index d8004c9..0000000
Binary files a/samples/mdi/makemac.mcp and /dev/null differ

diff --git a/samples/memcheck/.cvsignore b/samples/memcheck/.cvsignore
index ec79c7868398ce9d28aace96d55378ef3531fe88..c413feddbfeaa7e397fb9cf84e8cefc5c7bf6df6 100644 (file)
--- a/samples/memcheck/.cvsignore
+++ b/samples/memcheck/.cvsignore
@@ -1,2 +1,5 @@
-Makefile.in
-makemac?Data
+MemcheckM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index e09ad22ba29aa0eea106b6622dce5ad644952bb4..923f06f87d691517c29371c8b88f2da4628b5221 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -27,7 +27,7 @@
 
 #include "wx/date.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "mondrian.xpm"
 #endif
 

diff --git a/samples/menu/.cvsignore b/samples/menu/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..8b225e2cb6c232cf49435734610703849100314c 100644 (file)
--- a/samples/menu/.cvsignore
+++ b/samples/menu/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+MenuM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/menu/MenuM5.mcp b/samples/menu/MenuM5.mcp
new file mode 100644 (file)
index 0000000..3ae5296
Binary files /dev/null and b/samples/menu/MenuM5.mcp differ

diff --git a/samples/mfc/.cvsignore b/samples/mfc/.cvsignore
index f5eaa1a85937ad3c039965403e248ee9192db378..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/samples/mfc/.cvsignore
+++ b/samples/mfc/.cvsignore
@@ -1,2 +0,0 @@
-Makefile.in
-

diff --git a/samples/minifram/.cvsignore b/samples/minifram/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..1c1463b24e9088b0fc33fcb3b7725f0d0ea3cb89 100644 (file)
--- a/samples/minifram/.cvsignore
+++ b/samples/minifram/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+MiniframM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/minifram/MiniframM5.mcp b/samples/minifram/MiniframM5.mcp
new file mode 100644 (file)
index 0000000..5d0ae94
Binary files /dev/null and b/samples/minifram/MiniframM5.mcp differ

diff --git a/samples/minifram/makemac.mcp b/samples/minifram/makemac.mcp
deleted file mode 100644 (file)
index b296b10..0000000
Binary files a/samples/minifram/makemac.mcp and /dev/null differ

diff --git a/samples/minimal/.cvsignore b/samples/minimal/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..4433a33a77ca8d609ff8ed7c258d5ab1ae0af176 100644 (file)
--- a/samples/minimal/.cvsignore
+++ b/samples/minimal/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+MinimalM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/minimal/MinimalM5.mcp b/samples/minimal/MinimalM5.mcp
new file mode 100644 (file)
index 0000000..2842281
Binary files /dev/null and b/samples/minimal/MinimalM5.mcp differ

diff --git a/samples/minimal/makemac.mcp b/samples/minimal/makemac.mcp
deleted file mode 100644 (file)
index a811f53..0000000
Binary files a/samples/minimal/makemac.mcp and /dev/null differ

diff --git a/samples/nativdlg/.cvsignore b/samples/nativdlg/.cvsignore
index 232eceefa0e4ad991b48dac75340912007e1e2f2..0eca5074f991a46ef3ac38741ca6dfc77469f71b 100644 (file)
--- a/samples/nativdlg/.cvsignore
+++ b/samples/nativdlg/.cvsignore
@@ -1,4 +1,5 @@
-Makefile.in
-makemac?Data
-PPC?Debug*
-PPC?Release*
+NativdlgM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/newgrid/.cvsignore b/samples/newgrid/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..ee6bcbb790db43c03ed2ef7bb2285f8f9ea2498c 100644 (file)
--- a/samples/newgrid/.cvsignore
+++ b/samples/newgrid/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+NewGridM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/newgrid/NewGridM5.mcp b/samples/newgrid/NewGridM5.mcp
new file mode 100644 (file)
index 0000000..8542dc3
Binary files /dev/null and b/samples/newgrid/NewGridM5.mcp differ

diff --git a/samples/notebook/.cvsignore b/samples/notebook/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..aaa46beb5c124ef88971a33897232e3ce6642640 100644 (file)
--- a/samples/notebook/.cvsignore
+++ b/samples/notebook/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+NotebookM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/notebook/NotebookM5.mcp b/samples/notebook/NotebookM5.mcp
new file mode 100644 (file)
index 0000000..1923be7
Binary files /dev/null and b/samples/notebook/NotebookM5.mcp differ

diff --git a/samples/notebook/makemac.mcp b/samples/notebook/makemac.mcp
deleted file mode 100644 (file)
index 1011158..0000000
Binary files a/samples/notebook/makemac.mcp and /dev/null differ

diff --git a/samples/oleauto/.cvsignore b/samples/oleauto/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/samples/oleauto/.cvsignore
+++ b/samples/oleauto/.cvsignore
@@ -1 +0,0 @@
-Makefile.in

diff --git a/samples/opengl/cube/.cvsignore b/samples/opengl/cube/.cvsignore
index d42c2bd4b299d2682e136c95b71a152393f9fc3c..7c730d744bd12f8e0e861ec6a9c402c71e981a13 100644 (file)
--- a/samples/opengl/cube/.cvsignore
+++ b/samples/opengl/cube/.cvsignore
@@ -1,3 +1,5 @@
-makemac?Data
-PPC?Debug*
-PPC?Release*
+CubeM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/opengl/cube/CubeM5.mcp b/samples/opengl/cube/CubeM5.mcp
new file mode 100644 (file)
index 0000000..b6113c7
Binary files /dev/null and b/samples/opengl/cube/CubeM5.mcp differ

diff --git a/samples/opengl/cube/makemac.mcp b/samples/opengl/cube/makemac.mcp
deleted file mode 100644 (file)
index a8924de..0000000
Binary files a/samples/opengl/cube/makemac.mcp and /dev/null differ

diff --git a/samples/opengl/isosurf/.cvsignore b/samples/opengl/isosurf/.cvsignore
index d42c2bd4b299d2682e136c95b71a152393f9fc3c..672979f173d03a6291ad20bda9a8e6a5ddf119d4 100644 (file)
--- a/samples/opengl/isosurf/.cvsignore
+++ b/samples/opengl/isosurf/.cvsignore
@@ -1,3 +1,5 @@
-makemac?Data
-PPC?Debug*
-PPC?Release*
+IsoSurfM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/opengl/isosurf/IsoSurfM5.mcp b/samples/opengl/isosurf/IsoSurfM5.mcp
new file mode 100644 (file)
index 0000000..04705ba
Binary files /dev/null and b/samples/opengl/isosurf/IsoSurfM5.mcp differ

diff --git a/samples/opengl/penguin/.cvsignore b/samples/opengl/penguin/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..66fd128248ae519aa055462edc44d224217eef62 100644 (file)
--- a/samples/opengl/penguin/.cvsignore
+++ b/samples/opengl/penguin/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+PenguinM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/opengl/penguin/PenguinM5.mcp b/samples/opengl/penguin/PenguinM5.mcp
new file mode 100644 (file)
index 0000000..2b72d9f
Binary files /dev/null and b/samples/opengl/penguin/PenguinM5.mcp differ

diff --git a/samples/opengl/penguin/makemac.mcp b/samples/opengl/penguin/makemac.mcp
deleted file mode 100644 (file)
index c1147ff..0000000
Binary files a/samples/opengl/penguin/makemac.mcp and /dev/null differ

diff --git a/samples/ownerdrw/.cvsignore b/samples/ownerdrw/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/samples/ownerdrw/.cvsignore
+++ b/samples/ownerdrw/.cvsignore
@@ -1 +0,0 @@
-Makefile.in

diff --git a/samples/png/.cvsignore b/samples/png/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..bb90e631a3ad6fe8f48c218602eea916c30d44cf 100644 (file)
--- a/samples/png/.cvsignore
+++ b/samples/png/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+PngM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/png/PngM5.mcp b/samples/png/PngM5.mcp
new file mode 100644 (file)
index 0000000..c350049
Binary files /dev/null and b/samples/png/PngM5.mcp differ

diff --git a/samples/png/makemac.mcp b/samples/png/makemac.mcp
deleted file mode 100644 (file)
index 303597f..0000000
Binary files a/samples/png/makemac.mcp and /dev/null differ

diff --git a/samples/printing/.cvsignore b/samples/printing/.cvsignore
index d42c2bd4b299d2682e136c95b71a152393f9fc3c..da8ad77e3857279c086f115271d6502aae4986be 100644 (file)
--- a/samples/printing/.cvsignore
+++ b/samples/printing/.cvsignore
@@ -1,3 +1,5 @@
-makemac?Data
-PPC?Debug*
-PPC?Release*
+PrintingM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/printing/PrintingM5.mcp b/samples/printing/PrintingM5.mcp
new file mode 100644 (file)
index 0000000..53ee5f9
Binary files /dev/null and b/samples/printing/PrintingM5.mcp differ

diff --git a/samples/printing/makemac.mcp b/samples/printing/makemac.mcp
deleted file mode 100644 (file)
index 98d966e..0000000
Binary files a/samples/printing/makemac.mcp and /dev/null differ

diff --git a/samples/proplist/.cvsignore b/samples/proplist/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..ea22d1bd3f58ffeea5574a9db3572370e33a9492 100644 (file)
--- a/samples/proplist/.cvsignore
+++ b/samples/proplist/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+ProplistM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/proplist/ProplistM5.mcp b/samples/proplist/ProplistM5.mcp
new file mode 100644 (file)
index 0000000..e4a4a0d
Binary files /dev/null and b/samples/proplist/ProplistM5.mcp differ

diff --git a/samples/proplist/makemac.mcp b/samples/proplist/makemac.mcp
deleted file mode 100644 (file)
index 172990f..0000000
Binary files a/samples/proplist/makemac.mcp and /dev/null differ

diff --git a/samples/propsize/.cvsignore b/samples/propsize/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..a3d815829ea4c241f046a455509798ecddf461aa 100644 (file)
--- a/samples/propsize/.cvsignore
+++ b/samples/propsize/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+PropsizeM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/propsize/PropsizeM5.mcp b/samples/propsize/PropsizeM5.mcp
new file mode 100644 (file)
index 0000000..1625205
Binary files /dev/null and b/samples/propsize/PropsizeM5.mcp differ

diff --git a/samples/propsize/makemac.mcp b/samples/propsize/makemac.mcp
deleted file mode 100644 (file)
index a29af63..0000000
Binary files a/samples/propsize/makemac.mcp and /dev/null differ

diff --git a/samples/regtest/.cvsignore b/samples/regtest/.cvsignore
index 232eceefa0e4ad991b48dac75340912007e1e2f2..5ddcd36e776847b47cf8eec37606c7e93931bdd8 100644 (file)
--- a/samples/regtest/.cvsignore
+++ b/samples/regtest/.cvsignore
@@ -1,4 +1,5 @@
-Makefile.in
-makemac?Data
-PPC?Debug*
-PPC?Release*
+RegtestM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/regtest/RegtestM5.mcp b/samples/regtest/RegtestM5.mcp
new file mode 100644 (file)
index 0000000..c9eecb7
Binary files /dev/null and b/samples/regtest/RegtestM5.mcp differ

diff --git a/samples/resource/.cvsignore b/samples/resource/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..9de897992897c2e538ff4df80313d4d59e180123 100644 (file)
--- a/samples/resource/.cvsignore
+++ b/samples/resource/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+ResourceM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/resource/ResourceM5.mcp b/samples/resource/ResourceM5.mcp
new file mode 100644 (file)
index 0000000..16434b5
Binary files /dev/null and b/samples/resource/ResourceM5.mcp differ

diff --git a/samples/resource/makemac.mcp b/samples/resource/makemac.mcp
deleted file mode 100644 (file)
index f11bf93..0000000
Binary files a/samples/resource/makemac.mcp and /dev/null differ

diff --git a/samples/richedit/.cvsignore b/samples/richedit/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..effad5838ec6bd325dd64a7ce306a43a88528488 100644 (file)
--- a/samples/richedit/.cvsignore
+++ b/samples/richedit/.cvsignore
@@ -1 +1,5 @@
-Makefile.in
+RichEditM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/richedit/RichEditM5.mcp b/samples/richedit/RichEditM5.mcp
new file mode 100644 (file)
index 0000000..11acb95
Binary files /dev/null and b/samples/richedit/RichEditM5.mcp differ

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 7ba8765da96c22666836bee54f46d8962e88f601..e70db238f91ed432076e769fc34fdf67f09c8921 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -469,7 +469,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #endif
    wxPageSetupData data;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);
@@ -485,7 +485,7 @@ void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
 
    wxPrintData data;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
    wxPrintDialog printerDialog(this, & data);
 #else
    wxGenericPrintDialog printerDialog(this, & data);
@@ -498,7 +498,7 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPageSetupData data;
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 3a6cdd1b6467a53e9d0d49c166f1d29e146bdb29..a674ae577daa816bfe1955b0647d51a0b4796d55 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -3196,7 +3196,7 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom,
    /* We allocate a temporary wxDC for printing, so that we can
       determine the correct paper size and scaling. We don't actually
       print anything on it. */
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
    wxPrinterDC *psdc = new wxPrinterDC("","",WXLLIST_TEMPFILE,false);
 #else
    wxPostScriptDC *psdc = new wxPostScriptDC(WXLLIST_TEMPFILE,false);

diff --git a/samples/rotate/.cvsignore b/samples/rotate/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..ef05bb88b14b59a250f072a3734364a1ba524e0f 100644 (file)
--- a/samples/rotate/.cvsignore
+++ b/samples/rotate/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+RotateM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/rotate/RotateM5.mcp b/samples/rotate/RotateM5.mcp
new file mode 100644 (file)
index 0000000..cbc75a8
Binary files /dev/null and b/samples/rotate/RotateM5.mcp differ

diff --git a/samples/rotate/makemac.mcp b/samples/rotate/makemac.mcp
deleted file mode 100644 (file)
index ef89a40..0000000
Binary files a/samples/rotate/makemac.mcp and /dev/null differ

diff --git a/samples/sashtest/.cvsignore b/samples/sashtest/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..f987e153547255039521a8b7066efe583c7e48eb 100644 (file)
--- a/samples/sashtest/.cvsignore
+++ b/samples/sashtest/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+SashtestM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/sashtest/SashtestM5.mcp b/samples/sashtest/SashtestM5.mcp
new file mode 100644 (file)
index 0000000..efaa7b8
Binary files /dev/null and b/samples/sashtest/SashtestM5.mcp differ

diff --git a/samples/sashtest/makemac.mcp b/samples/sashtest/makemac.mcp
deleted file mode 100644 (file)
index 8c72d77..0000000
Binary files a/samples/sashtest/makemac.mcp and /dev/null differ

diff --git a/samples/scroll/.cvsignore b/samples/scroll/.cvsignore
index d42c2bd4b299d2682e136c95b71a152393f9fc3c..2190a4739dee69106ba9a329f454889707a9f2cf 100644 (file)
--- a/samples/scroll/.cvsignore
+++ b/samples/scroll/.cvsignore
@@ -1,3 +1,5 @@
-makemac?Data
-PPC?Debug*
-PPC?Release*
+ScrollM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/scroll/ScrollM5.mcp b/samples/scroll/ScrollM5.mcp
new file mode 100644 (file)
index 0000000..f93ba46
Binary files /dev/null and b/samples/scroll/ScrollM5.mcp differ

diff --git a/samples/scroll/makemac.mcp b/samples/scroll/makemac.mcp
deleted file mode 100644 (file)
index 62cab94..0000000
Binary files a/samples/scroll/makemac.mcp and /dev/null differ

diff --git a/samples/scrollsub/.cvsignore b/samples/scrollsub/.cvsignore
index d42c2bd4b299d2682e136c95b71a152393f9fc3c..cd11dd059515c79d2f5b1964d830d6c261cd9281 100644 (file)
--- a/samples/scrollsub/.cvsignore
+++ b/samples/scrollsub/.cvsignore
@@ -1,3 +1,5 @@
-makemac?Data
-PPC?Debug*
-PPC?Release*
+ScrollsubM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/scrollsub/ScrollsubM5.mcp b/samples/scrollsub/ScrollsubM5.mcp
new file mode 100644 (file)
index 0000000..b7d9c7c
Binary files /dev/null and b/samples/scrollsub/ScrollsubM5.mcp differ

diff --git a/samples/scrollsub/makemac.mcp b/samples/scrollsub/makemac.mcp
deleted file mode 100644 (file)
index 0a34564..0000000
Binary files a/samples/scrollsub/makemac.mcp and /dev/null differ

diff --git a/samples/sockets/.cvsignore b/samples/sockets/.cvsignore
index 8b137891791fe96927ad78e64b0aad7bded08bdc..1ff2084c69d12f28bb46a5366973314d33e8766c 100644 (file)
--- a/samples/sockets/.cvsignore
+++ b/samples/sockets/.cvsignore
@@ -1 +1,6 @@
-
+ClientM*Data
+ServerM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/splitter/.cvsignore b/samples/splitter/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..3bcefe3237e780ed9512b6a037c72df6d3648e7d 100644 (file)
--- a/samples/splitter/.cvsignore
+++ b/samples/splitter/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+SplitterM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/splitter/SplitterM5.mcp b/samples/splitter/SplitterM5.mcp
new file mode 100644 (file)
index 0000000..8210ab0
Binary files /dev/null and b/samples/splitter/SplitterM5.mcp differ

diff --git a/samples/splitter/makemac.mcp b/samples/splitter/makemac.mcp
deleted file mode 100644 (file)
index 8cd1f9e..0000000
Binary files a/samples/splitter/makemac.mcp and /dev/null differ

diff --git a/samples/statbar/.cvsignore b/samples/statbar/.cvsignore
index d42c2bd4b299d2682e136c95b71a152393f9fc3c..7ec3a99c5358ba341ad0446e3841fedebbf7d455 100644 (file)
--- a/samples/statbar/.cvsignore
+++ b/samples/statbar/.cvsignore
@@ -1,3 +1,5 @@
-makemac?Data
-PPC?Debug*
-PPC?Release*
+StatbarM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/statbar/StatbarM5.mcp b/samples/statbar/StatbarM5.mcp
new file mode 100644 (file)
index 0000000..6524865
Binary files /dev/null and b/samples/statbar/StatbarM5.mcp differ

diff --git a/samples/statbar/makemac.mcp b/samples/statbar/makemac.mcp
deleted file mode 100644 (file)
index 43f7069..0000000
Binary files a/samples/statbar/makemac.mcp and /dev/null differ

diff --git a/samples/tab/.cvsignore b/samples/tab/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..3fb6ed9f011231dc7d8e974107600b6c02025ae5 100644 (file)
--- a/samples/tab/.cvsignore
+++ b/samples/tab/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+TabM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/tab/TabM5.mcp b/samples/tab/TabM5.mcp
new file mode 100644 (file)
index 0000000..56952b6
Binary files /dev/null and b/samples/tab/TabM5.mcp differ

diff --git a/samples/tab/makemac.mcp b/samples/tab/makemac.mcp
deleted file mode 100644 (file)
index 2ee8c60..0000000
Binary files a/samples/tab/makemac.mcp and /dev/null differ

diff --git a/samples/taskbar/.cvsignore b/samples/taskbar/.cvsignore
index 70845e08eb0b807b1022dc47cd27e67f726d4a0f..0b013817a9be4f4ebec3a29827bec03f8fe0922f 100644 (file)
--- a/samples/taskbar/.cvsignore
+++ b/samples/taskbar/.cvsignore
@@ -1 +1,5 @@
-Makefile.in
+TaskbarM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/taskbar/TaskbarM5.mcp b/samples/taskbar/TaskbarM5.mcp
new file mode 100644 (file)
index 0000000..c701d05
Binary files /dev/null and b/samples/taskbar/TaskbarM5.mcp differ

diff --git a/samples/text/.cvsignore b/samples/text/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..80d4ea401e2f82305017c822dcaec428a93a9b0b 100644 (file)
--- a/samples/text/.cvsignore
+++ b/samples/text/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+TextM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/text/TextM5.mcp b/samples/text/TextM5.mcp
new file mode 100644 (file)
index 0000000..f4459e9
Binary files /dev/null and b/samples/text/TextM5.mcp differ

diff --git a/samples/text/makemac.mcp b/samples/text/makemac.mcp
deleted file mode 100644 (file)
index bdd9bcc..0000000
Binary files a/samples/text/makemac.mcp and /dev/null differ

diff --git a/samples/thread/.cvsignore b/samples/thread/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..574024293aa3a2dd16bdc06c13c46004b7b89fee 100644 (file)
--- a/samples/thread/.cvsignore
+++ b/samples/thread/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+ThreadM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/thread/ThreadM5.mcp b/samples/thread/ThreadM5.mcp
new file mode 100644 (file)
index 0000000..eb373ed
Binary files /dev/null and b/samples/thread/ThreadM5.mcp differ

diff --git a/samples/thread/makemac.mcp b/samples/thread/makemac.mcp
deleted file mode 100644 (file)
index 01b1a99..0000000
Binary files a/samples/thread/makemac.mcp and /dev/null differ

diff --git a/samples/toolbar/.cvsignore b/samples/toolbar/.cvsignore
index 8b137891791fe96927ad78e64b0aad7bded08bdc..8d976f560ece98916f96468b1f08223233898fdc 100644 (file)
--- a/samples/toolbar/.cvsignore
+++ b/samples/toolbar/.cvsignore
@@ -1 +1,5 @@
-
+ToolbarM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/toolbar/ToolbarM5.mcp b/samples/toolbar/ToolbarM5.mcp
new file mode 100644 (file)
index 0000000..f16285e
Binary files /dev/null and b/samples/toolbar/ToolbarM5.mcp differ

diff --git a/samples/toolbar/makemac.mcp b/samples/toolbar/makemac.mcp
deleted file mode 100644 (file)
index 953589b..0000000
Binary files a/samples/toolbar/makemac.mcp and /dev/null differ

diff --git a/samples/treectrl/.cvsignore b/samples/treectrl/.cvsignore
index f7a96bf5b1898ee84b767a6b33a35afebd50f225..e086f4b69443ac09202a9576d952d9a7e932f812 100644 (file)
--- a/samples/treectrl/.cvsignore
+++ b/samples/treectrl/.cvsignore
@@ -1,2 +1,5 @@
-makemac?Data
-PPC?Debug*
+TreectrlM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/treectrl/TreectrlM5.mcp b/samples/treectrl/TreectrlM5.mcp
new file mode 100644 (file)
index 0000000..435daa7
Binary files /dev/null and b/samples/treectrl/TreectrlM5.mcp differ

diff --git a/samples/treectrl/makemac.mcp b/samples/treectrl/makemac.mcp
deleted file mode 100644 (file)
index 39431de..0000000
Binary files a/samples/treectrl/makemac.mcp and /dev/null differ

diff --git a/samples/treelay/.cvsignore b/samples/treelay/.cvsignore
index b2ecb02d1f5608cd50df27939a1e945d10a5239c..08fefac929a556ac08193c6b1cd0712b318d4515 100644 (file)
--- a/samples/treelay/.cvsignore
+++ b/samples/treelay/.cvsignore
@@ -1,4 +1,4 @@
-makemac?Data
+TreelayM*Data
 *Classic?Debug*
 *Classic?Release*
 *Carbon?Debug*

diff --git a/samples/treelay/TreelayM5.mcp b/samples/treelay/TreelayM5.mcp
new file mode 100644 (file)
index 0000000..5ec4779
Binary files /dev/null and b/samples/treelay/TreelayM5.mcp differ

diff --git a/samples/treelay/makemac.mcp b/samples/treelay/makemac.mcp
deleted file mode 100644 (file)
index 51eec06..0000000
Binary files a/samples/treelay/makemac.mcp and /dev/null differ

diff --git a/samples/typetest/.cvsignore b/samples/typetest/.cvsignore
index 8b137891791fe96927ad78e64b0aad7bded08bdc..c26777d79e058b4211b8ac3812b297f434f66781 100644 (file)
--- a/samples/typetest/.cvsignore
+++ b/samples/typetest/.cvsignore
@@ -1 +1,5 @@
-
+TypetestM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/typetest/TypetestM5.mcp b/samples/typetest/TypetestM5.mcp
new file mode 100644 (file)
index 0000000..538a5b6
Binary files /dev/null and b/samples/typetest/TypetestM5.mcp differ

diff --git a/samples/typetest/makemac.mcp b/samples/typetest/makemac.mcp
deleted file mode 100644 (file)
index 139830c..0000000
Binary files a/samples/typetest/makemac.mcp and /dev/null differ

diff --git a/samples/validate/.cvsignore b/samples/validate/.cvsignore
index 8b137891791fe96927ad78e64b0aad7bded08bdc..790661238c4c7f3f81626b484c0ad8c8b697713b 100644 (file)
--- a/samples/validate/.cvsignore
+++ b/samples/validate/.cvsignore
@@ -1 +1,5 @@
-
+ValidateM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/validate/ValidateM5.mcp b/samples/validate/ValidateM5.mcp
new file mode 100644 (file)
index 0000000..0f7a7aa
Binary files /dev/null and b/samples/validate/ValidateM5.mcp differ

diff --git a/samples/validate/makemac.mcp b/samples/validate/makemac.mcp
deleted file mode 100644 (file)
index 7edd3ad..0000000
Binary files a/samples/validate/makemac.mcp and /dev/null differ

diff --git a/samples/widgets/.cvsignore b/samples/widgets/.cvsignore
new file mode 100644 (file)
index 0000000..7cb4139
--- /dev/null
+++ b/samples/widgets/.cvsignore
@@ -0,0 +1,5 @@
+WidgetsM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/widgets/WidgetsM5.mcp b/samples/widgets/WidgetsM5.mcp
new file mode 100644 (file)
index 0000000..a538836
Binary files /dev/null and b/samples/widgets/WidgetsM5.mcp differ

diff --git a/samples/wizard/.cvsignore b/samples/wizard/.cvsignore
new file mode 100644 (file)
index 0000000..33b88a9
--- /dev/null
+++ b/samples/wizard/.cvsignore
@@ -0,0 +1,5 @@
+WizardM*Data
+*Classic?Debug*
+*Classic?Release*
+*Carbon?Debug*
+*Carbon?Release*

diff --git a/samples/wizard/WizardM5.mcp b/samples/wizard/WizardM5.mcp
new file mode 100644 (file)
index 0000000..88397be
Binary files /dev/null and b/samples/wizard/WizardM5.mcp differ

diff --git a/samples/wizard/makemac.mcp b/samples/wizard/makemac.mcp
deleted file mode 100644 (file)
index 51c26c1..0000000
Binary files a/samples/wizard/makemac.mcp and /dev/null differ