This commit was manufactured by cvs2svn to create tag

'BEFORE_WIN16_REMOVAL'.

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

.cvsignore

@@ -72,3 +72,4 @@ win32-release
 log
 univtags.cmd
 .DS_Store
+autom4te.cache

build/bakefiles/README

@@ -20,7 +20,10 @@ all wxHTML samples. -b and -f can be combined.
 You can customize the process of generating makefiles by adding file
 Bakefiles.local.bkgen (same format as Bakefiles.bkgen) with further settings.
 For example, you may disable output for compilers you don't use:
-   <disable-formats>msvc,msvc6prj</disable-formats>
+   <?xml version="1.0" ?>
+   <bakefile-gen>
+     <disable-formats>msvc,msvc6prj</disable-formats>
+   </bakefile-gen>
 
 Note: bakefile_gen creates file .bakefile_gen.state with dependencies
 information. This file can be safely deleted, but it contains valuable

build/bakefiles/files.bkl

@@ -105,18 +105,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="BASE_MAC_SRC" hints="files">
-    src/mac/dirmac.cpp
-    src/mac/mimetmac.cpp
+    src/mac/carbon/dirmac.cpp
+    src/mac/carbon/mimetmac.cpp
     src/unix/baseunix.cpp
-    src/mac/utilsexc.cpp
-    src/mac/thread.cpp
-    src/mac/macnotfy.cpp
-    src/mac/morefilex/MoreFilesX.c
+    src/mac/carbon/utilsexc.cpp
+    src/mac/carbon/thread.cpp
+    src/mac/carbon/macnotfy.cpp
+    src/mac/carbon/morefilex/MoreFilesX.c
 </set>
 
 <set var="BASE_AND_GUI_MAC_SRC" hints="files">
-    src/mac/utils.cpp
-    src/mac/uma.cpp
+    src/mac/carbon/utils.cpp
+    src/mac/carbon/uma.cpp
 </set>
 
 <set var="BASE_MAC_HDR" hints="files">
@@ -1526,77 +1526,77 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
 <set var="MAC_SRC" hints="files">
-    src/mac/accel.cpp
-    src/mac/aga.cpp
-    src/mac/app.cpp
-    src/mac/bitmap.cpp
-    src/mac/bmpbuttn.cpp
-    src/mac/brush.cpp
-    src/mac/button.cpp
-    src/mac/checkbox.cpp
-    src/mac/checklst.cpp
-    src/mac/choice.cpp
-    src/mac/clipbrd.cpp
-    src/mac/colordlg.cpp
-    src/mac/colour.cpp
-    src/mac/combobox.cpp
-    src/mac/control.cpp
-    src/mac/cursor.cpp
-    src/mac/data.cpp
-    src/mac/dataobj.cpp
-    src/mac/dc.cpp
-    src/mac/dcclient.cpp
-    src/mac/dcmemory.cpp
-    src/mac/dcprint.cpp
-    src/mac/dcscreen.cpp
-    src/mac/dialog.cpp
-    src/mac/dirdlg.cpp
-    src/mac/display.cpp
-    src/mac/dnd.cpp
-    src/mac/filedlg.cpp
-    src/mac/font.cpp
-    src/mac/fontdlg.cpp
-    src/mac/fontenum.cpp
-    src/mac/fontutil.cpp
-    src/mac/frame.cpp
-    src/mac/gauge.cpp
-    src/mac/gdiobj.cpp
-    src/mac/gsockosx.c
-    src/mac/icon.cpp
-    src/mac/listbox.cpp
-    src/mac/mdi.cpp
-    src/mac/menu.cpp
-    src/mac/menuitem.cpp
-    src/mac/metafile.cpp
-    src/mac/minifram.cpp
-    src/mac/msgdlg.cpp
-    src/mac/notebmac.cpp
-    src/mac/palette.cpp
-    src/mac/pen.cpp
-    src/mac/pnghand.cpp
-    src/mac/printdlg.cpp
-    src/mac/printmac.cpp
-    src/mac/radiobox.cpp
-    src/mac/radiobut.cpp
-    src/mac/region.cpp
-    src/mac/renderer.cpp
-    src/mac/scrolbar.cpp
-    src/mac/settings.cpp
-    src/mac/slider.cpp
-    src/mac/spinbutt.cpp
-    src/mac/statbmp.cpp
-    src/mac/statbox.cpp
-    src/mac/statbrma.cpp
-    src/mac/statlmac.cpp
-    src/mac/stattext.cpp
-    src/mac/tabctrl.cpp
-    src/mac/textctrl.cpp
-    src/mac/timer.cpp
-    src/mac/tglbtn.cpp
-    src/mac/toolbar.cpp
-    src/mac/tooltip.cpp
-    src/mac/toplevel.cpp
-    src/mac/window.cpp
+    src/mac/carbon/accel.cpp
+    src/mac/carbon/aga.cpp
+    src/mac/carbon/app.cpp
+    src/mac/carbon/bitmap.cpp
+    src/mac/carbon/bmpbuttn.cpp
+    src/mac/carbon/brush.cpp
+    src/mac/carbon/button.cpp
+    src/mac/carbon/checkbox.cpp
+    src/mac/carbon/checklst.cpp
+    src/mac/carbon/choice.cpp
+    src/mac/carbon/clipbrd.cpp
+    src/mac/carbon/colordlg.cpp
+    src/mac/carbon/colour.cpp
+    src/mac/carbon/combobox.cpp
+    src/mac/carbon/control.cpp
+    src/mac/carbon/cursor.cpp
+    src/mac/carbon/data.cpp
+    src/mac/carbon/dataobj.cpp
+    src/mac/carbon/dc.cpp
+    src/mac/carbon/dcclient.cpp
+    src/mac/carbon/dcmemory.cpp
+    src/mac/carbon/dcprint.cpp
+    src/mac/carbon/dcscreen.cpp
+    src/mac/carbon/dialog.cpp
+    src/mac/carbon/dirdlg.cpp
+    src/mac/carbon/display.cpp
+    src/mac/carbon/dnd.cpp
+    src/mac/carbon/filedlg.cpp
+    src/mac/carbon/font.cpp
+    src/mac/carbon/fontdlg.cpp
+    src/mac/carbon/fontenum.cpp
+    src/mac/carbon/fontutil.cpp
+    src/mac/carbon/frame.cpp
+    src/mac/carbon/gauge.cpp
+    src/mac/carbon/gdiobj.cpp
+    src/mac/carbon/gsockosx.c
+    src/mac/carbon/icon.cpp
+    src/mac/carbon/listbox.cpp
+    src/mac/carbon/mdi.cpp
+    src/mac/carbon/menu.cpp
+    src/mac/carbon/menuitem.cpp
+    src/mac/carbon/metafile.cpp
+    src/mac/carbon/minifram.cpp
+    src/mac/carbon/msgdlg.cpp
+    src/mac/carbon/notebmac.cpp
+    src/mac/carbon/palette.cpp
+    src/mac/carbon/pen.cpp
+    src/mac/carbon/pnghand.cpp
+    src/mac/carbon/printdlg.cpp
+    src/mac/carbon/printmac.cpp
+    src/mac/carbon/radiobox.cpp
+    src/mac/carbon/radiobut.cpp
+    src/mac/carbon/region.cpp
+    src/mac/carbon/renderer.cpp
+    src/mac/carbon/scrolbar.cpp
+    src/mac/carbon/settings.cpp
+    src/mac/carbon/slider.cpp
+    src/mac/carbon/spinbutt.cpp
+    src/mac/carbon/statbmp.cpp
+    src/mac/carbon/statbox.cpp
+    src/mac/carbon/statbrma.cpp
+    src/mac/carbon/statlmac.cpp
+    src/mac/carbon/stattext.cpp
+    src/mac/carbon/tabctrl.cpp
+    src/mac/carbon/textctrl.cpp
+    src/mac/carbon/timer.cpp
+    src/mac/carbon/tglbtn.cpp
+    src/mac/carbon/toolbar.cpp
+    src/mac/carbon/tooltip.cpp
+    src/mac/carbon/toplevel.cpp
+    src/mac/carbon/window.cpp
     <!-- Generic implementations used by wxMac: -->
     src/generic/caret.cpp
     src/generic/fdrepdlg.cpp
@@ -1610,86 +1610,86 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/unix/snglinst.cpp
 </set>
 <set var="MAC_HDR" hints="files">
-    wx/mac/accel.h
-    wx/mac/aga.h
-    wx/mac/app.h
-    wx/mac/bitmap.h
-    wx/mac/bmpbuttn.h
-    wx/mac/brush.h
-    wx/mac/button.h
-    wx/mac/checkbox.h
-    wx/mac/checklst.h
-    wx/mac/chkconf.h
-    wx/mac/choice.h
-    wx/mac/clipbrd.h
-    wx/mac/colordlg.h
-    wx/mac/colour.h
-    wx/mac/combobox.h
-    wx/mac/control.h
-    wx/mac/cursor.h
-    wx/mac/dataform.h
-    wx/mac/dataobj.h
-    wx/mac/dataobj2.h
-    wx/mac/dc.h
-    wx/mac/dcclient.h
-    wx/mac/dcmemory.h
-    wx/mac/dcprint.h
-    wx/mac/dcscreen.h
-    wx/mac/dialog.h
-    wx/mac/dirdlg.h
-    wx/mac/display.h
-    wx/mac/dnd.h
-    wx/mac/filedlg.h
-    wx/mac/font.h
-    wx/mac/fontdlg.h
-    wx/mac/frame.h
-    wx/mac/gauge.h
-    wx/mac/gdiobj.h
-    wx/mac/gsockmac.h
-    wx/mac/helpxxxx.h
-    wx/mac/icon.h
-    wx/mac/imaglist.h
-    wx/mac/listbox.h
-    wx/mac/listctrl.h
-    wx/mac/macnotfy.h
-    wx/mac/macsock.h
-    wx/mac/mdi.h
-    wx/mac/menu.h
-    wx/mac/menuitem.h
-    wx/mac/metafile.h
-    wx/mac/mimetype.h
-    wx/mac/minifram.h
-    wx/mac/msgdlg.h
-    wx/mac/notebook.h
-    wx/mac/palette.h
-    wx/mac/pen.h
-    wx/mac/pnghand.h
-    wx/mac/pngread.h
-    wx/mac/printdlg.h
-    wx/mac/printmac.h
-    wx/mac/private.h
-    wx/mac/radiobox.h
-    wx/mac/radiobut.h
-    wx/mac/region.h
-    wx/mac/scrolbar.h
-    wx/mac/slider.h
-    wx/mac/spinbutt.h
-    wx/mac/spinctrl.h
-    wx/mac/statbmp.h
-    wx/mac/statbox.h
-    wx/mac/statline.h
-    wx/mac/stattext.h
-    wx/mac/statusbr.h
-    wx/mac/tabctrl.h
-    wx/mac/textctrl.h
-    wx/mac/timer.h
-    wx/mac/tglbtn.h
-    wx/mac/toolbar.h
-    wx/mac/tooltip.h
-    wx/mac/toplevel.h
-    wx/mac/treectrl.h
-    wx/mac/uma.h
-    wx/mac/window.h
+    wx/mac/carbon/accel.h
+    wx/mac/carbon/aga.h
+    wx/mac/carbon/app.h
+    wx/mac/carbon/bitmap.h
+    wx/mac/carbon/bmpbuttn.h
+    wx/mac/carbon/brush.h
+    wx/mac/carbon/button.h
+    wx/mac/carbon/checkbox.h
+    wx/mac/carbon/checklst.h
+    wx/mac/carbon/chkconf.h
+    wx/mac/carbon/choice.h
+    wx/mac/carbon/clipbrd.h
+    wx/mac/carbon/colordlg.h
+    wx/mac/carbon/colour.h
+    wx/mac/carbon/combobox.h
+    wx/mac/carbon/control.h
+    wx/mac/carbon/cursor.h
+    wx/mac/carbon/dataform.h
+    wx/mac/carbon/dataobj.h
+    wx/mac/carbon/dataobj2.h
+    wx/mac/carbon/dc.h
+    wx/mac/carbon/dcclient.h
+    wx/mac/carbon/dcmemory.h
+    wx/mac/carbon/dcprint.h
+    wx/mac/carbon/dcscreen.h
+    wx/mac/carbon/dialog.h
+    wx/mac/carbon/dirdlg.h
+    wx/mac/carbon/display.h
+    wx/mac/carbon/dnd.h
+    wx/mac/carbon/filedlg.h
+    wx/mac/carbon/font.h
+    wx/mac/carbon/fontdlg.h
+    wx/mac/carbon/frame.h
+    wx/mac/carbon/gauge.h
+    wx/mac/carbon/gdiobj.h
+    wx/mac/carbon/gsockmac.h
+    wx/mac/carbon/helpxxxx.h
+    wx/mac/carbon/icon.h
+    wx/mac/carbon/imaglist.h
+    wx/mac/carbon/listbox.h
+    wx/mac/carbon/listctrl.h
+    wx/mac/carbon/macnotfy.h
+    wx/mac/carbon/macsock.h
+    wx/mac/carbon/mdi.h
+    wx/mac/carbon/menu.h
+    wx/mac/carbon/menuitem.h
+    wx/mac/carbon/metafile.h
+    wx/mac/carbon/mimetype.h
+    wx/mac/carbon/minifram.h
+    wx/mac/carbon/msgdlg.h
+    wx/mac/carbon/notebook.h
+    wx/mac/carbon/palette.h
+    wx/mac/carbon/pen.h
+    wx/mac/carbon/pnghand.h
+    wx/mac/carbon/pngread.h
+    wx/mac/carbon/printdlg.h
+    wx/mac/carbon/printmac.h
+    wx/mac/carbon/private.h
+    wx/mac/carbon/radiobox.h
+    wx/mac/carbon/radiobut.h
+    wx/mac/carbon/region.h
+    wx/mac/carbon/scrolbar.h
+    wx/mac/carbon/slider.h
+    wx/mac/carbon/spinbutt.h
+    wx/mac/carbon/spinctrl.h
+    wx/mac/carbon/statbmp.h
+    wx/mac/carbon/statbox.h
+    wx/mac/carbon/statline.h
+    wx/mac/carbon/stattext.h
+    wx/mac/carbon/statusbr.h
+    wx/mac/carbon/tabctrl.h
+    wx/mac/carbon/textctrl.h
+    wx/mac/carbon/timer.h
+    wx/mac/carbon/tglbtn.h
+    wx/mac/carbon/toolbar.h
+    wx/mac/carbon/tooltip.h
+    wx/mac/carbon/toplevel.h
+    wx/mac/carbon/treectrl.h
+    wx/mac/carbon/uma.h
+    wx/mac/carbon/window.h
     <!-- Generic implementations used by wxMac: -->
     wx/generic/caret.h
     wx/generic/fdrepdlg.h
@@ -1787,7 +1787,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/tabg.cpp
     src/generic/timer.cpp
     <!-- wxMac stuff used by wxCocoa: -->
-    src/mac/gsockosx.c
+    src/mac/carbon/gsockosx.c
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -2023,12 +2023,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="ADVANCED_MAC_SRC" hints="files">
-    src/mac/joystick.cpp
-    src/mac/sound.cpp
+    src/mac/carbon/joystick.cpp
+    src/mac/carbon/sound.cpp
 </set>
 <set var="ADVANCED_MAC_HDR" hints="files">
-    wx/mac/joystick.h
-    wx/mac/sound.h
+    wx/mac/carbon/joystick.h
+    wx/mac/carbon/sound.h
 </set>
 
 <set var="ADVANCED_OS2_SRC" hints="files">
@@ -2134,7 +2134,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="OPENGL_SRC" hints="files">
-    <if cond="TOOLKIT=='MAC'">src/mac/glcanvas.cpp</if>
+    <if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
     <if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
     <if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
@@ -2143,7 +2143,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="OPENGL_HDR" hints="files">
-    <if cond="TOOLKIT=='MAC'">wx/mac/glcanvas.h</if>
+    <if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
     <if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
     <if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
     <if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>

build/bakefiles/formats/wx24dsp.empy

@@ -318,6 +318,10 @@ LIB32=link.exe -lib
 # Name "wxWindows - Win32 Release"
 # Name "wxWindows - Win32 Debug"
 # Name "wxWindows - Win32 Release With Debug Info"
+# Begin Source File
+
+SOURCE="This project is deprecated, please see install.txt"
+# End Source File
 @[for group in SOURCES]@
 # Begin Group "@group[0]"
 

build/bakefiles/mac_bundles.bkl

@@ -16,13 +16,13 @@
     </set>
     
     <set var="BUNDLE_PLIST">
-        $(TOP_SRCDIR)src/mac/Info.plist.in
+        $(TOP_SRCDIR)src/mac/carbon/Info.plist.in
     </set>
     <set var="BUNDLE_RESOURCE">
         $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).$(WXSOVERSION[0]).rsrc
     </set>
     <set var="BUNDLE_ICONS">
-        $(TOP_SRCDIR)src/mac/wxmac.icns
+        $(TOP_SRCDIR)src/mac/carbon/wxmac.icns
     </set>
 
     <define-tag name="wx-mac-app-bundle" rules="exe">

build/bakefiles/make_dist.mk

@@ -257,16 +257,27 @@ MOTIF_DIST: ALL_GUI_DIST
 
 MACX_DIST: ALL_GUI_DIST
 	cp $(INCDIR)/*.* $(DISTDIR)/include
+	mkdir $(DISTDIR)/include/wx/mac/carbon
+	mkdir $(DISTDIR)/include/wx/mac/private
+	mkdir $(DISTDIR)/include/wx/mac/carbon/private
 	cp $(INCDIR)/wx/mac/*.h $(DISTDIR)/include/wx/mac
-	cp $(MACDIR)/*.cpp $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.c $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.h $(DISTDIR)/src/mac
-	cp $(MACDIR)/*.r $(DISTDIR)/src/mac
-	mkdir $(DISTDIR)/src/mac/morefile
-	cp $(MACDIR)/morefile/*.h $(DISTDIR)/src/mac/morefile
-	cp $(MACDIR)/morefile/*.c $(DISTDIR)/src/mac/morefile
-	mkdir $(DISTDIR)/src/mac/macsock
-	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
+	cp $(INCDIR)/wx/mac/carbon/*.h $(DISTDIR)/include/wx/mac/carbon
+	cp $(INCDIR)/wx/mac/carbon/private/*.h $(DISTDIR)/include/wx/mac/carbon/private
+	cp $(INCDIR)/wx/mac/private/*.h $(DISTDIR)/include/wx/mac/private
+	cp $(MACDIR)/carbon/*.cpp $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.c $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.h $(DISTDIR)/src/mac/carbon
+	cp $(MACDIR)/carbon/*.r $(DISTDIR)/src/mac/carbon
+	mkdir $(DISTDIR)/src/mac/carbon/morefile
+	cp $(MACDIR)/carbon/morefile/*.h $(DISTDIR)/src/mac/carbon/morefile
+	cp $(MACDIR)/carbon/morefile/*.c $(DISTDIR)/src/mac/carbon/morefile
+	mkdir $(DISTDIR)/src/mac/carbon/morefilex
+	cp $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
+	cp $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
+	cp $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
+# obsolete
+#	mkdir $(DISTDIR)/src/mac/macsock
+#	cp $(MACDIR)/macsock/*.lib $(DISTDIR)/src/mac/macsock
 	mkdir $(DISTDIR)/contrib
 	cp -R $(WXDIR)/contrib $(DISTDIR)
 

configure.in

@@ -2121,7 +2121,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
             AC_CHECK_HEADER(png.h)
 
             if test "$ac_cv_header_png_h" = "yes"; then
-                AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm])
+                AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm])
             fi
 
             if test "x$PNG_LINK" = "x" ; then
@@ -2914,9 +2914,9 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             AC_MSG_RESULT([none])
         fi
 
-        CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
+        CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
 
-        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
+        TOOLKIT_VPATH="\${top_srcdir}/src/mac/carbon${PATH_IFS}\${top_srcdir}/src/mac/carbon/morefilex"
         TOOLKIT=MAC
         dnl we can't call this MAC_DIST or autoconf thinks its a macro
         GUIDIST=MACX_DIST
@@ -3377,6 +3377,10 @@ EOF
         chmod +x change-install-names
       ;;
       
+      *-*-cygwin* | *-*-mingw32* )
+        TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
+	;;
+      
     esac
 
     dnl set target to shared if not explicitly chose static before

contrib/include/wx/ogl/drawnp.h

@@ -146,7 +146,7 @@ class WXDLLIMPEXP_OGL wxOpDraw: public wxDrawOp
 {
  public:
   wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
-         double radius = 0.0, wxChar *s = NULL);
+         double radius = 0.0, const wxString& s = wxEmptyString);
   ~wxOpDraw();
   void Do(wxDC& dc, double xoffset, double yoffset);
   void Scale(double scaleX, double scaleY);
@@ -166,7 +166,7 @@ public:
   double     m_x3;
   double     m_y3;
   double     m_radius;
-  wxChar*    m_textString;
+  wxString   m_textString;
 
 };
 

contrib/samples/animate/Makefile.in

@@ -130,7 +130,7 @@ anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
 	$(__anitest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p anitest.app/Contents
 	mkdir -p anitest.app/Contents/MacOS
 	mkdir -p anitest.app/Contents/Resources
@@ -139,7 +139,7 @@ anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/anitest/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >anitest.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >anitest.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >anitest.app/Contents/PkgInfo

contrib/samples/deprecated/proplist/Makefile.in

@@ -130,7 +130,7 @@ proplist$(EXEEXT): $(PROPLIST_OBJECTS) $(__proplist___win32rc)
 	$(__proplist___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p proplist.app/Contents
 	mkdir -p proplist.app/Contents/MacOS
 	mkdir -p proplist.app/Contents/Resources
@@ -139,7 +139,7 @@ proplist.app/Contents/PkgInfo: proplist$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/proplist/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >proplist.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >proplist.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >proplist.app/Contents/PkgInfo

contrib/samples/deprecated/resource/Makefile.in

@@ -130,7 +130,7 @@ resource$(EXEEXT): $(RESOURCE_OBJECTS) $(__resource___win32rc)
 	$(__resource___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p resource.app/Contents
 	mkdir -p resource.app/Contents/MacOS
 	mkdir -p resource.app/Contents/Resources
@@ -139,7 +139,7 @@ resource.app/Contents/PkgInfo: resource$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/resource/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >resource.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >resource.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >resource.app/Contents/PkgInfo

contrib/samples/deprecated/treelay/Makefile.in

@@ -130,7 +130,7 @@ treelay$(EXEEXT): $(TREELAY_OBJECTS) $(__treelay___win32rc)
 	$(__treelay___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p treelay.app/Contents
 	mkdir -p treelay.app/Contents/MacOS
 	mkdir -p treelay.app/Contents/Resources
@@ -139,7 +139,7 @@ treelay.app/Contents/PkgInfo: treelay$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/treelay/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >treelay.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >treelay.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >treelay.app/Contents/PkgInfo

contrib/samples/fl/Makefile.in

@@ -221,7 +221,7 @@ fl_demo1$(EXEEXT): $(FL_DEMO1_OBJECTS) $(__fl_demo1___win32rc)
 	$(__fl_demo1___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p fl_demo1.app/Contents
 	mkdir -p fl_demo1.app/Contents/MacOS
 	mkdir -p fl_demo1.app/Contents/Resources
@@ -230,7 +230,7 @@ fl_demo1.app/Contents/PkgInfo: fl_demo1$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/fl_demo1/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >fl_demo1.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo1.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >fl_demo1.app/Contents/PkgInfo
@@ -251,7 +251,7 @@ fl_demo2$(EXEEXT): $(FL_DEMO2_OBJECTS) $(__fl_demo2___win32rc)
 	$(__fl_demo2___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p fl_demo2.app/Contents
 	mkdir -p fl_demo2.app/Contents/MacOS
 	mkdir -p fl_demo2.app/Contents/Resources
@@ -260,7 +260,7 @@ fl_demo2.app/Contents/PkgInfo: fl_demo2$(EXEEXT) $(top_srcdir)/src/mac/Info.plis
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/fl_demo2/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >fl_demo2.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_demo2.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >fl_demo2.app/Contents/PkgInfo
@@ -281,7 +281,7 @@ fl_sample1$(EXEEXT): $(FL_SAMPLE1_OBJECTS) $(__fl_sample1___win32rc)
 	$(__fl_sample1___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p fl_sample1.app/Contents
 	mkdir -p fl_sample1.app/Contents/MacOS
 	mkdir -p fl_sample1.app/Contents/Resources
@@ -290,7 +290,7 @@ fl_sample1.app/Contents/PkgInfo: fl_sample1$(EXEEXT) $(top_srcdir)/src/mac/Info.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/fl_sample1/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >fl_sample1.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample1.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >fl_sample1.app/Contents/PkgInfo
@@ -311,7 +311,7 @@ fl_sample2$(EXEEXT): $(FL_SAMPLE2_OBJECTS) $(__fl_sample2___win32rc)
 	$(__fl_sample2___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p fl_sample2.app/Contents
 	mkdir -p fl_sample2.app/Contents/MacOS
 	mkdir -p fl_sample2.app/Contents/Resources
@@ -320,7 +320,7 @@ fl_sample2.app/Contents/PkgInfo: fl_sample2$(EXEEXT) $(top_srcdir)/src/mac/Info.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/fl_sample2/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >fl_sample2.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample2.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >fl_sample2.app/Contents/PkgInfo
@@ -341,7 +341,7 @@ fl_sample3$(EXEEXT): $(FL_SAMPLE3_OBJECTS) $(__fl_sample3___win32rc)
 	$(__fl_sample3___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p fl_sample3.app/Contents
 	mkdir -p fl_sample3.app/Contents/MacOS
 	mkdir -p fl_sample3.app/Contents/Resources
@@ -350,7 +350,7 @@ fl_sample3.app/Contents/PkgInfo: fl_sample3$(EXEEXT) $(top_srcdir)/src/mac/Info.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/fl_sample3/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >fl_sample3.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >fl_sample3.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >fl_sample3.app/Contents/PkgInfo

contrib/samples/gizmos/dynsash/Makefile.in

@@ -134,7 +134,7 @@ dynsash$(EXEEXT): $(DYNSASH_OBJECTS) $(__dynsash___win32rc)
 	$(__dynsash___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p dynsash.app/Contents
 	mkdir -p dynsash.app/Contents/MacOS
 	mkdir -p dynsash.app/Contents/Resources
@@ -143,7 +143,7 @@ dynsash.app/Contents/PkgInfo: dynsash$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/dynsash/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >dynsash.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >dynsash.app/Contents/PkgInfo

contrib/samples/gizmos/dynsash_switch/Makefile.in

@@ -134,7 +134,7 @@ dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
 	$(__dynsash_switch___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p dynsash_switch.app/Contents
 	mkdir -p dynsash_switch.app/Contents/MacOS
 	mkdir -p dynsash_switch.app/Contents/Resources
@@ -143,7 +143,7 @@ dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/m
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/dynsash_switch/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >dynsash_switch.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >dynsash_switch.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >dynsash_switch.app/Contents/PkgInfo

contrib/samples/gizmos/editlbox/Makefile.in

@@ -130,7 +130,7 @@ test$(EXEEXT): $(TEST_OBJECTS) $(__test___win32rc)
 	$(__test___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p test.app/Contents
 	mkdir -p test.app/Contents/MacOS
 	mkdir -p test.app/Contents/Resources
@@ -139,7 +139,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/test/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >test.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >test.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >test.app/Contents/PkgInfo

contrib/samples/gizmos/led/Makefile.in

@@ -129,7 +129,7 @@ led$(EXEEXT): $(LED_OBJECTS) $(__led___win32rc)
 	$(__led___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p led.app/Contents
 	mkdir -p led.app/Contents/MacOS
 	mkdir -p led.app/Contents/Resources
@@ -138,7 +138,7 @@ led.app/Contents/PkgInfo: led$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/led/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >led.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >led.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >led.app/Contents/PkgInfo

contrib/samples/gizmos/multicell/Makefile.in

@@ -130,7 +130,7 @@ mtest$(EXEEXT): $(MTEST_OBJECTS) $(__mtest___win32rc)
 	$(__mtest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p mtest.app/Contents
 	mkdir -p mtest.app/Contents/MacOS
 	mkdir -p mtest.app/Contents/Resources
@@ -139,7 +139,7 @@ mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/mtest/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >mtest.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >mtest.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >mtest.app/Contents/PkgInfo

contrib/samples/gizmos/splittree/Makefile.in

@@ -130,7 +130,7 @@ splittree$(EXEEXT): $(SPLITTREE_OBJECTS) $(__splittree___win32rc)
 	$(__splittree___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p splittree.app/Contents
 	mkdir -p splittree.app/Contents/MacOS
 	mkdir -p splittree.app/Contents/Resources
@@ -139,7 +139,7 @@ splittree.app/Contents/PkgInfo: splittree$(EXEEXT) $(top_srcdir)/src/mac/Info.pl
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/splittree/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >splittree.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >splittree.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >splittree.app/Contents/PkgInfo

contrib/samples/mmedia/Makefile.in

@@ -132,7 +132,7 @@ mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
 	$(__mmboard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p mmboard.app/Contents
 	mkdir -p mmboard.app/Contents/MacOS
 	mkdir -p mmboard.app/Contents/Resources
@@ -141,7 +141,7 @@ mmboard.app/Contents/PkgInfo: mmboard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/mmboard/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >mmboard.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >mmboard.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >mmboard.app/Contents/PkgInfo

contrib/samples/ogl/ogledit/Makefile.in

@@ -133,7 +133,7 @@ ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc)
 	$(__ogledit___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p ogledit.app/Contents
 	mkdir -p ogledit.app/Contents/MacOS
 	mkdir -p ogledit.app/Contents/Resources
@@ -142,7 +142,7 @@ ogledit.app/Contents/PkgInfo: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/ogledit/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >ogledit.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >ogledit.app/Contents/PkgInfo

contrib/samples/ogl/studio/Makefile.in

@@ -148,7 +148,7 @@ studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
 	$(__studio___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p studio.app/Contents
 	mkdir -p studio.app/Contents/MacOS
 	mkdir -p studio.app/Contents/Resources
@@ -157,7 +157,7 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/studio/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >studio.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >studio.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >studio.app/Contents/PkgInfo

contrib/samples/plot/Makefile.in

@@ -130,7 +130,7 @@ plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
 	$(__plot___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p plot.app/Contents
 	mkdir -p plot.app/Contents/MacOS
 	mkdir -p plot.app/Contents/Resources
@@ -139,7 +139,7 @@ plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/plot/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >plot.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >plot.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >plot.app/Contents/PkgInfo

contrib/samples/stc/Makefile.in

@@ -132,7 +132,7 @@ stctest$(EXEEXT): $(STCTEST_OBJECTS) $(__stctest___win32rc)
 	$(__stctest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p stctest.app/Contents
 	mkdir -p stctest.app/Contents/MacOS
 	mkdir -p stctest.app/Contents/Resources
@@ -141,7 +141,7 @@ stctest.app/Contents/PkgInfo: stctest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/stctest/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >stctest.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >stctest.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >stctest.app/Contents/PkgInfo

contrib/samples/svg/Makefile.in

@@ -130,7 +130,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
 	$(__svgtest___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p svgtest.app/Contents
 	mkdir -p svgtest.app/Contents/MacOS
 	mkdir -p svgtest.app/Contents/Resources
@@ -139,7 +139,7 @@ svgtest.app/Contents/PkgInfo: svgtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/svgtest/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >svgtest.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >svgtest.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >svgtest.app/Contents/PkgInfo

contrib/samples/xrc/Makefile.in

@@ -145,7 +145,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
 	$(__xrcdemo___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p xrcdemo.app/Contents
 	mkdir -p xrcdemo.app/Contents/MacOS
 	mkdir -p xrcdemo.app/Contents/Resources
@@ -154,7 +154,7 @@ xrcdemo.app/Contents/PkgInfo: xrcdemo$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/xrcdemo/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >xrcdemo.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >xrcdemo.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >xrcdemo.app/Contents/PkgInfo

contrib/src/ogl/divided.cpp

@@ -700,9 +700,8 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double WXUNUSED(x), double y, int
         wxShapeRegion *region = (wxShapeRegion *)node->GetData();
         if (region->GetText())
         {
-        wxChar *s = copystring(region->GetText());
-        dividedObject->FormatText(dc, s, i);
-        delete[] s;
+        wxString s(region->GetText());
+        dividedObject->FormatText(dc, s.c_str(), i);
         }
         node = node->GetNext();
         i++;

contrib/src/ogl/drawn.cpp

@@ -676,7 +676,7 @@ void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
  */
 
 wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
-         double theRadius, wxChar *s) : wxDrawOp(theOp)
+         double theRadius, const wxString& s) : wxDrawOp(theOp)
 {
   m_x1 = theX1;
   m_y1 = theY1;
@@ -685,13 +685,11 @@ wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double t
   m_x3 = 0.0;
   m_y3 = 0.0;
   m_radius = theRadius;
-  if (s) m_textString = copystring(s);
-  else m_textString = NULL;
+  m_textString = s;
 }
 
 wxOpDraw::~wxOpDraw()
 {
-  if (m_textString) delete[] m_textString;
 }
 
 wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *WXUNUSED(newImage))
@@ -968,8 +966,7 @@ void wxOpDraw::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
     {
       m_x1 = expr->Nth(1)->RealValue();
       m_y1 = expr->Nth(2)->RealValue();
-      wxString str(expr->Nth(3)->StringValue());
-      m_textString = copystring(str);
+      m_textString = wxString(expr->Nth(3)->StringValue());
       break;
     }
     case DRAWOP_DRAW_ARC:
@@ -2365,7 +2362,7 @@ void wxPseudoMetaFile::DrawText(const wxString& text, const wxPoint& pt)
     wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_TEXT,
           (double) pt.x, (double) pt.y, 0.0, 0.0);
 
-    theOp->m_textString = copystring(text);
+    theOp->m_textString = text;
 
     m_ops.Append(theOp);
 }

contrib/src/ogl/oglmisc.cpp

@@ -505,7 +505,7 @@ void oglDrawFormattedText(wxDC& dc, wxList *text_list,
 
   dc.SetClippingRegion(
                     (long)(m_xpos - width/2.0), (long)(m_ypos - height/2.0),
-                    (long)width, (long)height);
+                    (long)width+1, (long)height+1); // +1 to allow for rounding errors
 
   wxNode *current = text_list->GetFirst();
   while (current)

contrib/src/stc/PlatWX.cpp

@@ -1233,7 +1233,7 @@ wxString stc2wx(const char* str, size_t len)
     strncpy(buffer, str, len);
     buffer[len]=0;
 
-    wxString cstr(buffer, wxConvUTF8);
+    wxString cstr(buffer, wxConvUTF8, len);
 
     delete[] buffer;
     return cstr;

contrib/src/stc/ScintillaWX.cpp

@@ -58,11 +58,6 @@ void  wxSTCDropTarget::OnLeave() {
 #endif
 
 
-#ifdef __WXGTK__
-#undef wxSTC_USE_POPUP
-#define wxSTC_USE_POPUP 0
-#endif
-
 #if wxUSE_POPUPWIN && wxSTC_USE_POPUP
 #include <wx/popupwin.h>
 #define wxSTCCallTipBase wxPopupWindow

contrib/src/stc/stc.cpp

@@ -2547,8 +2547,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
         if (len > 0)
         {
 #if wxUSE_UNICODE
-            wxMemoryBuffer buffer(len);
+            wxMemoryBuffer buffer(len+1);
             success = (file.Read(buffer.GetData(), len) == len);
+            ((char*)buffer.GetData())[len] = 0;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
@@ -2656,6 +2657,14 @@ void wxStyledTextCtrl::OnMouseMiddleUp(wxMouseEvent& evt) {
 void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
     wxPoint pt = evt.GetPosition();
     ScreenToClient(&pt.x, &pt.y);
+    /*
+      Show context menu at event point if it's within the window,
+      or at caret location if not
+    */
+    wxHitTest ht = this->HitTest(pt);
+    if (ht != wxHT_WINDOW_INSIDE) {
+        pt = this->PointFromPosition(this->GetCurrentPos());
+    }
     m_swx->DoContextMenu(Point(pt.x, pt.y));
 }
 
@@ -2683,7 +2692,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
 //     printf("OnChar key:%d  consumed:%d  ctrl:%d  alt:%d  skip:%d\n",
 //            key, m_lastKeyDownConsumed, ctrl, alt, skip);
 
-    if ( (key <= WXK_START || key > WXK_NUMPAD_DIVIDE) &&
+    if ( (key <= WXK_START || key > WXK_COMMAND) &&
          !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
         return;

contrib/src/stc/stc.cpp.in

@@ -356,8 +356,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
         if (len > 0)
         {
 #if wxUSE_UNICODE
-            wxMemoryBuffer buffer(len);
+            wxMemoryBuffer buffer(len+1);
             success = (file.Read(buffer.GetData(), len) == len);
+            ((char*)buffer.GetData())[len] = 0;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
@@ -465,6 +466,14 @@ void wxStyledTextCtrl::OnMouseMiddleUp(wxMouseEvent& evt) {
 void wxStyledTextCtrl::OnContextMenu(wxContextMenuEvent& evt) {
     wxPoint pt = evt.GetPosition();
     ScreenToClient(&pt.x, &pt.y);
+    /*
+      Show context menu at event point if it's within the window,
+      or at caret location if not
+    */
+    wxHitTest ht = this->HitTest(pt);
+    if (ht != wxHT_WINDOW_INSIDE) {
+        pt = this->PointFromPosition(this->GetCurrentPos());
+    }
     m_swx->DoContextMenu(Point(pt.x, pt.y));
 }
 
@@ -492,7 +501,7 @@ void wxStyledTextCtrl::OnChar(wxKeyEvent& evt) {
 //     printf("OnChar key:%%d  consumed:%%d  ctrl:%%d  alt:%%d  skip:%%d\n",
 //            key, m_lastKeyDownConsumed, ctrl, alt, skip);
 
-    if ( (key <= WXK_START || key > WXK_NUMPAD_DIVIDE) &&
+    if ( (key <= WXK_START || key > WXK_COMMAND) &&
          !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
         return;

contrib/src/xrc/xh_bmpbt.cpp

@@ -32,6 +32,7 @@ wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
     XRC_ADD_STYLE(wxBU_RIGHT);
     XRC_ADD_STYLE(wxBU_TOP);
     XRC_ADD_STYLE(wxBU_BOTTOM);
+    XRC_ADD_STYLE(wxBU_EXACTFIT);
     AddWindowStyles();
 }
 

contrib/utils/wxrc/wxrc.cpp

@@ -59,7 +59,7 @@ private:
     {
         wxString classValue;
         wxString nameValue;
-        wxXmlNode* children;	
+        wxXmlNode* children;    
         while (node)
         {
             if (node->GetName() == _T("object")
@@ -70,62 +70,62 @@ private:
             }
             children = node->GetChildren();
             if (children)
-                    BrowseXmlNode(children);	
+                    BrowseXmlNode(children);    
             node = node->GetNext();
         }
     }
     
 public:
-	XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) :
-			m_className(className) , m_parentClassName(parentClassName) { 
-			
-			BrowseXmlNode(node->GetChildren());
-		
-		}
-		
-		const ArrayOfXRCWidgetData& GetWidgetData(){
-			return m_wdata;
-		}
-		void GenerateHeaderCode(wxFFile& file){
+    XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) :
+        m_className(className) , m_parentClassName(parentClassName) { 
+                        
+        BrowseXmlNode(node->GetChildren());
+                
+    }
+                
+    const ArrayOfXRCWidgetData& GetWidgetData(){
+        return m_wdata;
+    }
+    void GenerateHeaderCode(wxFFile& file){
 
-  		file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
-		+ _T(" {\nprotected:\n"));
-		for(size_t i=0;i<m_wdata.Count();++i){
-			const XRCWidgetData& w = m_wdata.Item(i);
-			file.Write(
-			_T(" ") + w.GetClass() + _T("* ") + w.GetName()
-			+ _T(";\n"));
-		}
-	file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(){\n")
-	   _T("  wxXmlResource::Get()->LoadObject(this,NULL,\"")
-	+  m_className 
-	+  +_T("\",\"")
-	+  m_parentClassName 
-	+  _T("\");\n"));	
-	for(size_t i=0;i<m_wdata.Count();++i){
-		const XRCWidgetData& w = m_wdata.Item(i);
-		file.Write(
-			_T("  ") 
-			+ w.GetName() 
-			+ _T(" = XRCCTRL(*this,\"")
-			+ w.GetName() 
-			+ _T("\",")
-			+ w.GetClass()
-			+ _T(");\n")
-		);
-	}
+        file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
+                   + _T(" {\nprotected:\n"));
+        size_t i;
+        for(i=0;i<m_wdata.Count();++i){
+            const XRCWidgetData& w = m_wdata.Item(i);
+            file.Write(
+                _T(" ") + w.GetClass() + _T("* ") + w.GetName()
+                + _T(";\n"));
+        }
+        file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(){\n")
+                   _T("  wxXmlResource::Get()->LoadObject(this,NULL,\"")
+                   +  m_className 
+                   +  _T("\",\"")
+                   +  m_parentClassName 
+                   +  _T("\");\n"));       
+        for(i=0;i<m_wdata.Count();++i){
+            const XRCWidgetData& w = m_wdata.Item(i);
+            file.Write( _T("  ") 
+                        + w.GetName() 
+                        + _T(" = XRCCTRL(*this,\"")
+                        + w.GetName() 
+                        + _T("\",")
+                        + w.GetClass()
+                        + _T(");\n")
+                );
+        }
 file.Write(_T(" }\n"));
-	
+        
 file.Write(
-	_T("public:\n")
-	+ m_className 
-	+ _T("::")
-	+ m_className
-	+ _T("(){\n")
-	+ _T("  InitWidgetsFromXRC();\n")
-	 _T(" }\n")
-	_T("};\n"));
-	};
+        _T("public:\n")
+        + m_className 
+        + _T("::")
+        + m_className
+        + _T("(){\n")
+        + _T("  InitWidgetsFromXRC();\n")
+         _T(" }\n")
+        _T("};\n"));
+        };
 };
 WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);
 WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData);
@@ -160,8 +160,8 @@ private:
     int retCode;
 
     ArrayOfXRCWndClassData aXRCWndClassData;
-	bool flagH;
-	void GenCPPHeader();
+        bool flagH;
+        void GenCPPHeader();
 };
 
 IMPLEMENT_APP_CONSOLE(XmlResApp)
@@ -173,7 +173,7 @@ int XmlResApp::OnRun()
         { wxCMD_LINE_SWITCH, _T("h"), _T("help"),  _T("show help message"), 
               wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
         { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") },
-		{ wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"),  _T("output C++ header file with XRC derived classes") },
+        { wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"),  _T("output C++ header file with XRC derived classes") },
         { wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"),  _T("output C++ source rather than .rsc file") },
         { wxCMD_LINE_SWITCH, _T("p"), _T("python-code"),  _T("output wxPython source rather than .rsc file") },
         { wxCMD_LINE_SWITCH, _T("g"), _T("gettext"),  _T("output list of translatable strings (to stdout or file if -o used)") },
@@ -350,17 +350,17 @@ wxArrayString XmlResApp::PrepareTempFiles()
         if (flagH)
         {
             wxXmlNode* node = (doc.GetRoot())->GetChildren();
-        	wxString classValue,nameValue;
-        	while(node){
+                wxString classValue,nameValue;
+                while(node){
                     if(node->GetName() == _T("object")
-            	     && node->GetPropVal(_T("class"),&classValue)
-            	     && node->GetPropVal(_T("name"),&nameValue)){
+                     && node->GetPropVal(_T("class"),&classValue)
+                     && node->GetPropVal(_T("name"),&nameValue)){
 
                       aXRCWndClassData.Add(
-                    	XRCWndClassData(nameValue,classValue,node)
+                        XRCWndClassData(nameValue,classValue,node)
                       );
                     }
-            	    node = node -> GetNext();
+                    node = node -> GetNext();
             }
         }
         wxString internalName = GetInternalFileName(parFiles[i], flist);
@@ -594,7 +594,7 @@ void XmlResApp::GenCPPHeader()
 {
     wxString fileSpec = (parOutput.BeforeLast('.')).AfterLast('/');
     wxString heaFileName = fileSpec + _T(".h");
-	
+        
     wxFFile file(heaFileName, wxT("wt"));
     file.Write(
 _T("//\n")
@@ -602,14 +602,14 @@ _T("// This file was automatically generated by wxrc, do not edit by hand.\n")
 _T("//\n\n")
 _T("#ifndef __")  + fileSpec + _T("_h__\n")
 _T("#define __")  + fileSpec + _T("_h__\n")
-);	
+);      
     for(size_t i=0;i<aXRCWndClassData.Count();++i){
-		aXRCWndClassData.Item(i).GenerateHeaderCode(file);		
+                aXRCWndClassData.Item(i).GenerateHeaderCode(file);              
     } 
     file.Write(
-		_T("\nvoid \n")
-		+ parFuncname
-		+ _T("();\n#endif\n"));
+                _T("\nvoid \n")
+                + parFuncname
+                + _T("();\n#endif\n"));
 }
 
 static wxString FileToPythonArray(wxString filename, int num)

demos/forty/canvas.cpp

@@ -38,12 +38,12 @@ BEGIN_EVENT_TABLE(FortyCanvas, wxScrolledWindow)
     EVT_MOUSE_EVENTS(FortyCanvas::OnMouseEvent)
 END_EVENT_TABLE()
 
-FortyCanvas::FortyCanvas(wxWindow* parent, int x, int y, int w, int h) :
-	wxScrolledWindow(parent, -1, wxPoint(x, y), wxSize(w, h)),
-	m_helpingHand(TRUE),
-	m_rightBtnUndo(TRUE),
+FortyCanvas::FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size) :
+	wxScrolledWindow(parent, wxID_ANY, pos, size),
+	m_helpingHand(true),
+	m_rightBtnUndo(true),
 	m_playerDialog(0),
-	m_leftBtnDown(FALSE)
+	m_leftBtnDown(false)
 {
 #ifdef __WXGTK__
 	m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
@@ -116,7 +116,7 @@ void FortyCanvas::OnDraw(wxDC& dc)
 		else
 		{
 			// user cancelled the dialog - exit the app
-			((wxFrame*)GetParent())->Close(TRUE);
+			((wxFrame*)GetParent())->Close(true);
 		}
 	}
 #endif
@@ -148,7 +148,7 @@ void FortyCanvas::ShowPlayerDialog()
 		else
 		{
 			// user cancelled the dialog - exit the app
-			((wxFrame*)GetParent())->Close(TRUE);
+			((wxFrame*)GetParent())->Close(true);
 		}
         }
 }
@@ -162,9 +162,9 @@ bool FortyCanvas::OnCloseCanvas()
 		wxMessageBox(_T("Are you sure you want to\nabandon the current game?"),
 			_T("Warning"), wxYES_NO | wxICON_QUESTION) == wxNO)
 	{
-        return FALSE;
+        return false;
 	}
-	return TRUE;
+	return true;
 }
 
 void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
@@ -180,7 +180,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 	{
 		if (m_leftBtnDown)
 		{
-			m_leftBtnDown = FALSE;
+			m_leftBtnDown = false;
 			ReleaseMouse();
 			m_game->LButtonUp(dc, mouseX, mouseY);
 		}
@@ -190,7 +190,7 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 	{
 		if (!m_leftBtnDown)
 		{
-			m_leftBtnDown = TRUE;
+			m_leftBtnDown = true;
 			CaptureMouse();
 			m_game->LButtonDown(dc, mouseX, mouseY);
 		}
@@ -199,14 +199,14 @@ void FortyCanvas::OnMouseEvent(wxMouseEvent& event)
 	{
 		if (m_leftBtnDown)
 		{
-			m_leftBtnDown = FALSE;
+			m_leftBtnDown = false;
 			ReleaseMouse();
 			m_game->LButtonUp(dc, mouseX, mouseY);
 		}
 	}
 	else if (event.RightDown() && !event.LeftIsDown())
 	{
-		// only allow right button undo if m_rightBtnUndo is TRUE
+		// only allow right button undo if m_rightBtnUndo is true
 		if (m_rightBtnUndo)
 		{
 			if (event.ControlDown() || event.ShiftDown())

demos/forty/canvas.h

@@ -21,7 +21,7 @@ class PlayerSelectionDialog;
 class FortyCanvas: public wxScrolledWindow
 {
 public:
-	FortyCanvas(wxWindow* parent, int x, int y, int w, int h);
+	FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size);
 	virtual ~FortyCanvas();
 
 	virtual void OnDraw(wxDC& dc);

demos/forty/card.cpp

@@ -111,11 +111,11 @@ Card::Card(int value, WayUp way_up) :
 			break;
 		}
 		m_pipValue = 1 + (value - 1) % 13;
-		m_status = TRUE;
+		m_status = true;
     }
     else
     {
-        m_status = FALSE;
+        m_status = false;
     }
 } // Card::Card()
 

demos/forty/forty.bkl

@@ -15,6 +15,7 @@
             scorefil.cpp
         </sources>
         <wx-lib>html</wx-lib>
+        <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>forty.rc</win32-res>

demos/forty/forty.cpp

@@ -39,8 +39,9 @@
 
 BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
 	EVT_MENU(NEW_GAME, FortyFrame::NewGame)
-	EVT_MENU(EXIT, FortyFrame::Exit)
-	EVT_MENU(ABOUT, FortyFrame::About)
+	EVT_MENU(wxID_EXIT, FortyFrame::Exit)
+	EVT_MENU(wxID_ABOUT, FortyFrame::About)
+	EVT_MENU(wxID_HELP_CONTENTS, FortyFrame::Help)
 	EVT_MENU(UNDO, FortyFrame::Undo)
 	EVT_MENU(REDO, FortyFrame::Redo)
 	EVT_MENU(SCORES, FortyFrame::Scores)
@@ -73,27 +74,30 @@ FortyApp::~FortyApp()
 
 bool FortyApp::OnInit()
 {
-        bool largecards = FALSE;
+  bool largecards = false;
+
         wxSize size(668,510);
 
         if ((argc > 1) && (!wxStrcmp(argv[1],_T("-L"))))
         {
-            largecards = TRUE;
+    largecards = true;
             size = wxSize(1000,750);
         }
 
 	FortyFrame* frame = new FortyFrame(
 			0,
 			_T("Forty Thieves"),
-                        -1, -1, size.x, size.y,largecards
+    wxDefaultPosition,
+    size,
+    largecards
 			);
 
  	// Show the frame
-	frame->Show(TRUE);
+	frame->Show(true);
 
         frame->GetCanvas()->ShowPlayerDialog();
 
-	return TRUE;
+	return true;
 }
 
 const wxColour& FortyApp::BackgroundColour()
@@ -127,12 +131,11 @@ const wxColour& FortyApp::TextColour()
 }
 
 // My frame constructor
-FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards):
-	wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards):
+	wxFrame(frame, wxID_ANY, title, pos, size)
 {
 #ifdef __WXMAC__
-	// we need this in order to allow the about menu relocation, since ABOUT is not the default id of the about menu 
-	wxApp::s_macAboutMenuItemId = ABOUT ;
+	wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
 #endif
 	// set the icon
 #ifdef __WXMSW__
@@ -147,7 +150,7 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int
 	wxMenu* gameMenu = new wxMenu;
 	gameMenu->Append(NEW_GAME, _T("&New"), _T("Start a new game"));
 	gameMenu->Append(SCORES, _T("&Scores..."), _T("Displays scores"));
-	gameMenu->Append(EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
+	gameMenu->Append(wxID_EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
 
 	wxMenu* editMenu = new wxMenu;
 	editMenu->Append(UNDO, _T("&Undo"), _T("Undo the last move"));
@@ -157,24 +160,25 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int
 	optionsMenu->Append(RIGHT_BUTTON_UNDO,
 			_T("&Right button undo"),
 			_T("Enables/disables right mouse button undo and redo"),
-			TRUE
+			true
 			);
 	optionsMenu->Append(HELPING_HAND,
 			_T("&Helping hand"),
 			_T("Enables/disables hand cursor when a card can be moved"),
-			TRUE
+			true
 			);
         optionsMenu->Append(LARGE_CARDS,
                         _T("&Large cards"),
                         _T("Enables/disables large cards for high resolution displays"),
-                        TRUE
+                        true
                         );
-	optionsMenu->Check(HELPING_HAND, TRUE);
-	optionsMenu->Check(RIGHT_BUTTON_UNDO, TRUE);
-        optionsMenu->Check(LARGE_CARDS, largecards ? TRUE : FALSE);
+	optionsMenu->Check(HELPING_HAND, true);
+	optionsMenu->Check(RIGHT_BUTTON_UNDO, true);
+        optionsMenu->Check(LARGE_CARDS, largecards ? true : false);
 
 	wxMenu* helpMenu = new wxMenu;
-	helpMenu->Append(ABOUT, _T("&About..."), _T("Displays information about the game"));
+	helpMenu->Append(wxID_HELP_CONTENTS, _T("&Help Contents"), _T("Displays information about playing the game"));
+	helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About Forty Thieves"));
 
 	m_menuBar = new wxMenuBar;
 	m_menuBar->Append(gameMenu,    _T("&Game"));
@@ -187,13 +191,12 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int
         if (largecards)
             Card::SetScale(1.3);
 
-	m_canvas = new FortyCanvas(this, 0, 0, 400, 400);
-	wxLayoutConstraints* constr = new wxLayoutConstraints;
-	constr->left.SameAs(this, wxLeft);
-	constr->top.SameAs(this, wxTop);
-	constr->right.SameAs(this, wxRight);
-	constr->height.SameAs(this, wxHeight);
-	m_canvas->SetConstraints(constr);
+	m_canvas = new FortyCanvas(this, wxDefaultPosition, size);
+
+  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+  topsizer->Add( m_canvas, 1, wxEXPAND | wxALL, 0);
+  SetSizer( topsizer );
+  topsizer->SetSizeHints( this );
 
 	CreateStatusBar();
 }
@@ -221,20 +224,16 @@ FortyFrame::NewGame(wxCommandEvent&)
 void
 FortyFrame::Exit(wxCommandEvent&)
 {
-#ifdef __WXGTK__
-	// wxGTK doesn't call OnClose() so we do it here
-//	if (OnClose())
-#endif
-	Close(TRUE);
+	Close(true);
 }
 
 void
-FortyFrame::About(wxCommandEvent&)
+FortyFrame::Help(wxCommandEvent& event)
 {
 #if wxUSE_HTML
     if (wxFileExists(wxT("about.htm")))
     {
-        FortyAboutDialog dialog(this, -1, wxT("About Forty Thieves"));
+        FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions"));
         if (dialog.ShowModal() == wxID_OK)
         {
         }
@@ -242,20 +241,24 @@ FortyFrame::About(wxCommandEvent&)
     else
 #endif
     {
-        wxMessageBox(
-            _T("Forty Thieves\n\n")
-            _T("A freeware program using the wxWindows\n")
-            _T("portable C++ GUI toolkit.\n")
-            _T("http://www.wxwindows.org\n")
-            _T("http://www.freiburg.linux.de/~wxxt\n\n")
-            _T("Author: Chris Breeze (c) 1992-1998\n")
-            _T("email: chris.breeze@iname.com"),
-            _T("About Forty Thieves"),
-            wxOK, this
-            );
+        About(event);
     }
 }
 
+void
+FortyFrame::About(wxCommandEvent&)
+{
+        wxMessageBox(
+            _T("Forty Thieves\n\n")
+            _T("A free card game written with the wxWidgets toolkit\n")
+            _T("Author: Chris Breeze (c) 1992-2004\n")
+            _T("email: chris@breezesys.com"),
+            _T("About Forty Thieves"),
+            wxOK|wxICON_INFORMATION, this
+            );
+}
+
+
 void
 FortyFrame::Undo(wxCommandEvent&)
 {
@@ -379,13 +382,12 @@ bool FortyAboutDialog::AddControls(wxWindow* parent)
 
     item0->Add( item2, 0, wxALIGN_RIGHT|wxALL, 5 );
 
-    parent->SetAutoLayout( TRUE );
     parent->SetSizer( item0 );
     parent->Layout();
     item0->Fit( parent );
     item0->SetSizeHints( parent );
 #endif
 
-    return TRUE;
+    return true;
 }
 

demos/forty/forty.h

@@ -34,7 +34,7 @@ class FortyCanvas;
 class FortyFrame: public wxFrame
 {
 public:
-        FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards);
+  FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
 	virtual ~FortyFrame();
 
 	void OnCloseWindow(wxCloseEvent& event);
@@ -43,6 +43,7 @@ public:
 	void NewGame(wxCommandEvent& event);
 	void Exit(wxCommandEvent& event);
 	void About(wxCommandEvent& event);
+	void Help(wxCommandEvent& event);
 	void Undo(wxCommandEvent& event);
 	void Redo(wxCommandEvent& event);
 	void Scores(wxCommandEvent& event);
@@ -55,10 +56,10 @@ public:
 	DECLARE_EVENT_TABLE()
 
 private:
-	enum MenuCommands { NEW_GAME = 10, SCORES, EXIT,
+	enum MenuCommands { NEW_GAME = 10, SCORES,
 						UNDO, REDO,
-                                                RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS,
-						ABOUT };
+                        RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS
+					};
 
 	wxMenuBar*		m_menuBar;
 	FortyCanvas*	m_canvas;

demos/forty/forty.r

@@ -0,0 +1,27 @@
+#include "Types.r"
+
+resource 'BNDL' (128) {
+	'FTHA',
+	0,
+	{	/* array TypeArray: 2 elements */
+		/* [1] */
+		'ICN#',
+		{	/* array IDArray: 1 element */
+			/* [1] */
+			0, 128
+		},
+		/* [2] */
+		'FREF',
+		{	/* array IDArray: 1 element */
+			/* [1] */
+			0, 128
+		}
+	}
+};
+
+resource 'FREF' (128) {
+	'APPL',
+	0,
+	""
+};
+

demos/forty/game.cpp

@@ -35,7 +35,7 @@
 #include "game.h"
 
 Game::Game(int wins, int games, int score) :
-	m_inPlay(FALSE),
+	m_inPlay(false),
 	m_moveIndex(0),
 	m_redoIndex(0),
 	m_bmap(0),
@@ -181,7 +181,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
 
 	if (!m_inPlay)
 	{
-		m_inPlay = TRUE;
+		m_inPlay = true;
 		m_numGames++;
 	}
 	DisplayScore(dc);
@@ -198,7 +198,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
 		}
 
 		// This game is over
-		m_inPlay = FALSE;
+		m_inPlay = false;
 
 		// Redraw the score box to update games won
 		DisplayScore(dc);
@@ -212,7 +212,7 @@ void Game::DoMove(wxDC& dc, Pile* src, Pile* dest)
 		else
 		{
 			// user cancelled the dialog - exit the app
-			((wxFrame*)canvas->GetParent())->Close(TRUE);
+			((wxFrame*)canvas->GetParent())->Close(true);
 		}
 	}
 }
@@ -315,7 +315,7 @@ void Game::Deal()
 		m_totalScore += m_currentScore;
 	}
     m_currentScore = 0;
-    m_inPlay = FALSE;
+    m_inPlay = false;
 }
 
 
@@ -524,21 +524,21 @@ void Game::LButtonDblClk(wxDC& dc, int x, int y)
 // i.e. m_pack, discard and bases are empty
 bool Game::HaveYouWon()
 {
-    if (m_pack->GetTopCard()) return FALSE;
-    if (m_discard->GetTopCard()) return FALSE;
+    if (m_pack->GetTopCard()) return false;
+    if (m_discard->GetTopCard()) return false;
     for(int i = 0; i < 10; i++)
     {
-    	if (m_bases[i]->GetTopCard()) return FALSE;
+    	if (m_bases[i]->GetTopCard()) return false;
     }
     m_numWins++;
     m_totalScore += m_currentScore;
     m_currentScore = 0;
-    return TRUE;
+    return true;
 }
 
 
 // See whether the card under the cursor can be moved somewhere else
-// Returns TRUE if it can be moved, FALSE otherwise
+// Returns 'true' if it can be moved, 'false' otherwise
 bool Game::CanYouGo(int x, int y)
 {
     Pile* pile = WhichPile(x, y);
@@ -553,7 +553,7 @@ bool Game::CanYouGo(int x, int y)
 	    {
 	    	if (m_foundations[i]->AcceptCard(card) && m_foundations[i] != pile)
 		{
-                    return TRUE;
+                    return true;
 		}
             }
 	    for(i = 0; i < 10; i++)
@@ -562,12 +562,12 @@ bool Game::CanYouGo(int x, int y)
 		    m_bases[i]->AcceptCard(card) &&
 		    m_bases[i] != pile)
 		{
-		    return TRUE;
+		    return true;
 		}
             }
 	}
     }
-    return FALSE;
+    return false;
 }
 
 
@@ -642,12 +642,12 @@ void Game::LButtonUp(wxDC& dc, int x, int y)
 
 bool Game::DropCard(int x, int y, Pile* pile, Card* card)
 {
-    bool retval = FALSE;
+    bool retval = false;
     if (pile->Overlap(x, y))
     {
 	if (pile->AcceptCard(card))
 	{
-	    retval = TRUE;
+	    retval = true;
         }
     }
     return retval;
@@ -843,20 +843,20 @@ Base::Base(int x, int y) : Pile(x, y, 0, 12)
 
 bool Base::AcceptCard(Card* card)
 {
-    bool retval = FALSE;
+    bool retval = false;
 
     if (m_topCard >= 0)
     {
 	    if (m_cards[m_topCard]->GetSuit() == card->GetSuit() &&
 	        m_cards[m_topCard]->GetPipValue() - 1 == card->GetPipValue())
 	    {
-            retval = TRUE;
+            retval = true;
         }
     }
     else
     {
 		// pile is empty - ACCEPT
-        retval = TRUE;
+        retval = true;
     }
     return retval;
 }
@@ -877,20 +877,20 @@ Foundation::Foundation(int x, int y) : Pile(x, y, 0, 0)
 
 bool Foundation::AcceptCard(Card* card)
 {
-    bool retval = FALSE;
+    bool retval = false;
 
     if (m_topCard >= 0)
     {
 	    if (m_cards[m_topCard]->GetSuit() == card->GetSuit() &&
 	        m_cards[m_topCard]->GetPipValue() + 1 == card->GetPipValue())
 	    {
-            retval = TRUE;
+            retval = true;
         }
     }
     else if (card->GetPipValue() == 1)
     {
 	    // It's an ace and the pile is empty - ACCEPT
-        retval = TRUE;
+        retval = true;
     }
     return retval;
 }

demos/forty/pile.cpp

@@ -224,9 +224,9 @@ bool Pile::CanCardLeave(Card* card)
 {
     for (int i = 0; i <= m_topCard; i++)
     {
-    	if (card == m_cards[i]) return TRUE;
+    	if (card == m_cards[i]) return true;
     }
-    return FALSE;
+    return false;
 }
 
 // Calculate how far x, y is from top card in the pile
@@ -294,9 +294,9 @@ bool Pile::Overlap(int x, int y)
     if (x >= cardX - Card::GetWidth()  && x <= cardX + Card::GetWidth() &&
         y >= cardY - Card::GetHeight() && y <= cardY + Card::GetHeight())
     {
-	    return TRUE;
+	    return true;
     }
-    return FALSE;
+    return false;
 }
 
 

demos/forty/pile.h

@@ -66,7 +66,7 @@ public:
 	virtual Card* RemoveTopCard(wxDC& pDC, int xOffset = 0, int yOffset = 0);
 
 	// Functions to add a card to the top of a pile
-	virtual bool AcceptCard(Card*) { return FALSE; }
+	virtual bool AcceptCard(Card*) { return false; }
 	virtual void AddCard(Card* card);	// Add card to top of pile
 	virtual void AddCard(wxDC& pDC, Card* card);	// Add card + redraw it
         void SetPos(int x,int y) {m_x = x;m_y = y;};

demos/forty/playerdg.cpp

@@ -44,15 +44,12 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, -1, _T("Player Selection"),
-			wxDefaultPosition, wxSize(320, 200),
+	wxDialog(parent, wxID_ANY, _T("Player Selection"),
+			wxDefaultPosition, wxDefaultSize,
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
 {
-	// enable constraints
-	SetAutoLayout (TRUE);
-
-	wxStaticText* msg = new wxStaticText(this, -1, _T("Please select a name or type a new one:"));
+	wxStaticText* msg = new wxStaticText(this, wxID_ANY, _T("Please select a name or type a new one:"));
 
 	wxListBox* list = new wxListBox(
 						this, ID_LISTBOX,
@@ -68,63 +65,24 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 		list->Append(players[i]);
 	}
 
-	m_textField = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, 0);
+	m_textField = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, 0);
 
 	m_OK = new wxButton(this, wxID_OK, _T("OK"));
 	m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
 
-	wxLayoutConstraints* layout;
+  wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+  button_sizer->Add( m_OK, 0, wxALL, 10 );
+  button_sizer->Add( m_cancel, 0, wxALL, 10 );
 
-	// Constrain the msg at the top of the window
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->top.SameAs		(this,	wxTop,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	msg->SetConstraints(layout);
+  wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+  topsizer->Add( msg, 0, wxALL , 10 );
+  topsizer->Add( list, 1, wxEXPAND | wxLEFT | wxRIGHT, 10 );
+  topsizer->Add( m_textField, 0, wxEXPAND | wxLEFT | wxRIGHT | wxTOP, 10 );
+  topsizer->Add( button_sizer, 0, wxALIGN_LEFT );
 
-	// Constrain the OK button
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->bottom.SameAs	(this,	 wxBottom,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	m_OK->SetConstraints(layout);
+  SetSizer( topsizer );
 
-	// Constrain the OK button
-	layout = new wxLayoutConstraints;
-	layout->left.RightOf	(m_OK,	10);
-	layout->bottom.SameAs	(this,	wxBottom,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	m_cancel->SetConstraints(layout);
-
-	// Constrain the Name text entry field
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->right.SameAs	(this,	wxRight,	10);
-	layout->bottom.SameAs	(m_OK,	wxTop,		10);
-	layout->height.AsIs();
-	m_textField->SetConstraints(layout);
-
-	// Constrain the list of players
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->right.SameAs	(this,	wxRight,	10);
-	layout->top.Below		(msg,	10);
-	layout->bottom.SameAs	(m_textField,	wxTop,	10);
-	list->SetConstraints(layout);
-
-	wxString prevPlayer = m_scoreFile->GetPreviousPlayer();
-	if ((prevPlayer.Length() > 0) && (list->FindString(prevPlayer) != -1))
-	{
-		list->SetStringSelection(prevPlayer);
-		m_textField->SetValue(prevPlayer);
-	}
-
-    m_textField->SetFocus();
-
-	Layout();
+  topsizer->SetSizeHints( this );
     
     CentreOnParent();
 }
@@ -142,7 +100,7 @@ const wxString& PlayerSelectionDialog::GetPlayersName()
 {
 /*
 	m_player = "";
-	Show(TRUE);
+	Show(true);
 */
 	return m_player;
 }

demos/forty/scoredg.cpp

@@ -30,10 +30,15 @@
 #include "scorefil.h"
 #include "scoredg.h"
 
+#define USE_GRID_FOR_SCORE 0
+
+#if USE_GRID_FOR_SCORE
+#include "wx/grid.h"
+#else
 class ScoreCanvas : public wxScrolledWindow
 {
 public:
-	ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile);
+	ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile, const wxPoint& pos, wxSize& size);
 	virtual ~ScoreCanvas();
 
 	void OnDraw(wxDC& dc);
@@ -43,17 +48,17 @@ private:
 	wxString	m_text;
 };
 
-
-ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
-	wxScrolledWindow(parent)
+ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile, const wxPoint& pos, wxSize& size) :
+	wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
 {
+    SetBackgroundColour(*wxWHITE);
 #ifdef __WXGTK__
 	m_font = wxTheFontList->FindOrCreateFont(12, wxROMAN, wxNORMAL, wxNORMAL);
 #else
 	m_font = wxTheFontList->FindOrCreateFont(10, wxSWISS, wxNORMAL, wxNORMAL);
 #endif
 
-        wxArrayString players;
+    wxArrayString players;
 	scoreFile->GetPlayerList( players);
 
 	wxString os;
@@ -124,45 +129,72 @@ void ScoreCanvas::OnDraw(wxDC& dc)
 		if (*str) str++;
 	}
 }
+#endif
 
 BEGIN_EVENT_TABLE(ScoreDialog, wxDialog)
     EVT_CLOSE(ScoreDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
-ScoreDialog::ScoreDialog(
-							wxWindow* parent,
-							ScoreFile* file
-							) :
-	wxDialog(parent, -1, _("Scores"),
-			wxDefaultPosition, wxSize(310, 200),
+ScoreDialog::ScoreDialog(wxWindow* parent, ScoreFile* file) :
+	wxDialog(parent, wxID_ANY, _("Scores"),
+			wxDefaultPosition, wxSize(400, 300),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
 {
-	// enable constraints
-	SetAutoLayout (TRUE);
+    // create grid with players
+    wxArrayString players;
+	file->GetPlayerList(players);
+    
+    wxSize sz = wxSize(400, 300);
 
-	ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile);
-	m_OK = new wxButton(this, wxID_OK, _("OK"));
+#if USE_GRID_FOR_SCORE
+	wxGrid* list = new wxGrid(this, wxID_ANY, wxDefaultPosition, sz, 0);
+    list->CreateGrid(players.Count(), 4);
+	for (unsigned int i = 0; i < players.Count(); i++)
+	{
+		int wins, games, score;
+        wxString string_value;
 
-	wxLayoutConstraints* layout;
+		file->ReadPlayersScore(players[i], wins, games, score);
+		int average = 0;
+		if (games > 0)
+		{
+			average = (2 * score + games) / (2 * games);
+		}
+        list->SetCellValue(i,0,players[i]);
+        string_value.Printf( _T("%u"), wins );
+        list->SetCellValue(i,1,string_value);
+        string_value.Printf( _T("%u"), games );
+        list->SetCellValue(i,2,string_value);
+        string_value.Printf( _T("%u"), average );
+        list->SetCellValue(i,3,string_value);
+    }
+    list->SetColLabelValue(0, _T("Players"));
+    list->SetColLabelValue(1, _T("Wins"));
+    list->SetColLabelValue(2, _T("Games"));
+    list->SetColLabelValue(3, _T("Score"));
+    list->SetEditable(false);
+    list->AutoSizeColumns();
+    list->AutoSizeRows();
+    list->SetRowLabelSize(0);
+    list->EnableDragRowSize(false);
+    list->EnableDragColSize(false);
+    list->EnableDragGridSize(false);
+#else
+	ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile, wxDefaultPosition, sz);
+#endif
 
-	// Constrain the OK button
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->bottom.SameAs	(this,	 wxBottom,	10);
-	layout->height.AsIs();
-	layout->width.AsIs();
-	m_OK->SetConstraints(layout);
+    // locate and resize with sizers
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+    topsizer->Add( list, 1, wxALL|wxGROW, 10 );
+    topsizer->Add( new wxButton(this, wxID_OK, _("OK")), 0, wxALIGN_CENTER_HORIZONTAL|wxALL , 10 );
 
-	// Constrain the list of players
-	layout = new wxLayoutConstraints;
-	layout->left.SameAs		(this,	wxLeft,		10);
-	layout->right.SameAs	(this,	wxRight,	10);
-	layout->top.SameAs		(this,	wxTop,		10);
-	layout->bottom.SameAs	(m_OK,	wxTop,		10);
-	list->SetConstraints(layout);
+    SetSizer( topsizer );
 
-	Layout();
+    GetSizer()->Fit(this);
+    GetSizer()->SetSizeHints(this);
+    
+    CentreOnParent();
 }
 
 ScoreDialog::~ScoreDialog()
@@ -171,7 +203,7 @@ ScoreDialog::~ScoreDialog()
 
 void ScoreDialog::Display()
 {
-	Show(TRUE);
+	Show(true);
 }
 
 void ScoreDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

demos/poem/wxpoemCE.vcp

@@ -4,6 +4,7 @@
 
 # TARGTYPE "Win32 (WCE x86) Application" 0x8301
 # TARGTYPE "Win32 (WCE ARM) Application" 0x8501
+# TARGTYPE "Win32 (WCE emulator) Application" 0xa601
 
 CFG=wxPoemCE - Win32 (WCE ARM) Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -22,6 +23,10 @@ CFG=wxPoemCE - Win32 (WCE ARM) Debug
 !MESSAGE "wxPoemCE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
 !MESSAGE "wxPoemCE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
 !MESSAGE "wxPoemCE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
+!MESSAGE "wxPoemCE - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Application")
+!MESSAGE "wxPoemCE - Win32 (WCE x86) Debug eVC4" (based on "Win32 (WCE x86) Application")
+!MESSAGE "wxPoemCE - Win32 (WCE x86) Release eVC4" (based on "Win32 (WCE x86) Application")
+!MESSAGE "wxPoemCE - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Application")
 !MESSAGE 
 
 # Begin Project
@@ -45,22 +50,23 @@ CFG=wxPoemCE - Win32 (WCE ARM) Debug
 # PROP Intermediate_Dir "ARMRel"
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 wxmswce_armu.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"../../lib" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "../../include" /I "../../lib/wince_arm" /D "ARM" /D "_ARM_" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Oxs /M$(CECrtMT) /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE ARM) Debug"
 
@@ -77,22 +83,24 @@ LINK32=link.exe
 # PROP Intermediate_Dir "ARMDbg"
 # PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-RSC=rc.exe
-# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
-CPP=clarm.exe
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
-MTL=midl.exe
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 wxmswce_armud.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"../../lib" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../lib/wince_armd" /D "DEBUG" /D "ARM" /D "_ARM_" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Release"
 
@@ -109,13 +117,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "X86Rel"
 # PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
 # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /Oxs /c
-# ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /Oxs /c
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Oxs /I "../../lib/wince_x86u" /I "../../include" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Gs8192 /GF /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -123,8 +132,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
-# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) wxmswce_x86u.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Debug"
 
@@ -148,7 +157,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /Zi /Od /I "../../include" /I "../../lib/wince_x86ud" /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /FR /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../lib/wince_x86ud" /I "../../include" /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Gs8192 /GF /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -156,9 +165,146 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
-# ADD LINK32 $(CEx86Corelibc) wxmswce_x86ud.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
-# SUBTRACT LINK32 /pdb:none
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) wxmswce_x86ud.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE emulator) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "emulatorRel"
+# PROP BASE Intermediate_Dir "emulatorRel"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ReleaseUnicodeEmulator"
+# PROP Intermediate_Dir "ReleaseUnicodeEmulator"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Oxs /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Oxs /I "../../lib/wince_emu" /I "../../include" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Fp"X86Rel/wxPoemCE.pch" /YX /Fo"X86Rel/" /Gs8192 /GF /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) wxmswce_x86u.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) wxmswce_emu.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Debug eVC4"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "X86Debug eVC4"
+# PROP BASE Intermediate_Dir "X86Debug eVC4"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "X86Debug"
+# PROP Intermediate_Dir "X86Debug"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../lib/wince_x86ud" /I "../../include" /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Gs8192 /GF /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) wxmswce_x86ud.lib commdlg.lib ole32.lib oleaut32.lib ceshell.lib winsock.lib wininet.lib commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) wxmswce_x86ud.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Release eVC4"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "X86Release eVC4"
+# PROP BASE Intermediate_Dir "X86Release eVC4"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "X86Release"
+# PROP Intermediate_Dir "X86Release"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Oxs /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Oxs /I "../../lib/wince_x86u" /I "../../include" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "__WXWINCE__" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /Gs8192 /GF /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) wxmswce_x86u.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 $(CEx86Corelibc) wxmswce_x86u.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE emulator) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "emulatorDbg"
+# PROP BASE Intermediate_Dir "emulatorDbg"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "DebugUnicodeEmulator"
+# PROP Intermediate_Dir "DebugUnicodeEmulator"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d "$(CePlatform)" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /YX /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "../../lib/wince_emud" /I "../../include" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "DEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /YX /Gs8192 /GF /c
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) wxmswce_x86ud.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /out:"X86Debug/wxPoemCE.exe" /subsystem:$(CESubsystem) /MACHINE:IX86
+# SUBTRACT BASE LINK32 /incremental:no
+# ADD LINK32 $(CEx86Corelibc) wxmswce_emud.lib commdlg.lib ole32.lib oleaut32.lib winsock.lib wininet.lib commctrl.lib coredll.lib /nologo /base:"0x00010000" /stack:0x20000,0x2000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /out:"X86Debug/wxPoemCE.exe" /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
+# SUBTRACT LINK32 /incremental:no
 
 !ENDIF 
 
@@ -168,6 +314,10 @@ LINK32=link.exe
 # Name "wxPoemCE - Win32 (WCE ARM) Debug"
 # Name "wxPoemCE - Win32 (WCE x86) Release"
 # Name "wxPoemCE - Win32 (WCE x86) Debug"
+# Name "wxPoemCE - Win32 (WCE emulator) Release"
+# Name "wxPoemCE - Win32 (WCE x86) Debug eVC4"
+# Name "wxPoemCE - Win32 (WCE x86) Release eVC4"
+# Name "wxPoemCE - Win32 (WCE emulator) Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -235,6 +385,66 @@ NODEP_CPP_WXPOEM=\
 	".\wx\wxprec.h"\
 	
 
+!ELSEIF  "$(CFG)" == "xPoemCE - Win32 (WCE emulator) Release"
+
+DEP_CPP_WXPOEM=\
+	".\wxpoem.h"\
+	".\wxpoem.xpm"\
+	".\corner1.h"\
+	".\corner2.h"\
+	".\corner3.h"\
+	".\corner4.h"\
+	
+NODEP_CPP_WXPOEM=\
+	".\wx\wx.h"\
+	".\wx\wxprec.h"\
+	
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Debug eVC4"
+
+DEP_CPP_WXPOEM=\
+	".\wxpoem.h"\
+	".\wxpoem.xpm"\
+	".\corner1.h"\
+	".\corner2.h"\
+	".\corner3.h"\
+	".\corner4.h"\
+	
+NODEP_CPP_WXPOEM=\
+	".\wx\wx.h"\
+	".\wx\wxprec.h"\
+	
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Release eVC4"
+
+DEP_CPP_WXPOEM=\
+	".\wxpoem.h"\
+	".\wxpoem.xpm"\
+	".\corner1.h"\
+	".\corner2.h"\
+	".\corner3.h"\
+	".\corner4.h"\
+	
+NODEP_CPP_WXPOEM=\
+	".\wx\wx.h"\
+	".\wx\wxprec.h"\
+	
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE emulator) Debug"
+
+DEP_CPP_WXPOEM=\
+	".\wxpoem.h"\
+	".\wxpoem.xpm"\
+	".\corner1.h"\
+	".\corner2.h"\
+	".\corner3.h"\
+	".\corner4.h"\
+	
+NODEP_CPP_WXPOEM=\
+	".\wx\wx.h"\
+	".\wx\wxprec.h"\
+	
+
 !ENDIF 
 
 # End Source File
@@ -248,11 +458,34 @@ SOURCE=.\wxpoem.rc
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Release"
 
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "../../include"
+
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Debug"
 
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409 /i "../../include"
 
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE emulator) Release"
+
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "../../include"
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Debug eVC4"
+
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "../../include"
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Release eVC4"
+
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "../../include"
+
+!ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE emulator) Debug"
+
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409 /i "../../include"
+
 !ENDIF 
 
 # End Source File

descrip.mms

@@ -23,7 +23,7 @@ all :
 	make motif
 	purge [...]
 	delete [...]*.obj;
-	make univ
+	make x11
 	purge [...]
 	delete [...]*.obj;
 
@@ -78,57 +78,57 @@ gtk : [.include.wx]setup.h
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [--]
 
-univ : [.include.wx]setup.h
+x11 : [.include.wx]setup.h
 	set default [.src.generic]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 	set default [-.common]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 	set default [-.html]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 	set default [-.unix]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-	set default [-.gtk]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.x11]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 	set default [-.univ]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 	set default [--.contrib.src.deprecated]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [---.demos.bombs]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [--.samples.calendar]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.caret]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.checklst]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.config]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.controls]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.db]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.dialogs]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.dialup]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.dnd]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.docview]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.drawing]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.font]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.image]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.mdi]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.menu]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.minimal]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
-#	set default [-.richedit]
-#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [---.demos.bombs]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [--.samples.calendar]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.caret]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.checklst]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.config]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.controls]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.db]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.dialogs]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.dialup]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.dnd]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.docview]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.drawing]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.font]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.image]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.mdi]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.menu]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.minimal]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	set default [-.richedit]
+#	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
 	set default [--]
 
 motif : [.include.wx]setup.h

docs/changes.txt

@@ -39,6 +39,12 @@ INCOMPATIBLE CHANGES SINCE 2.4.x
 - wxChoice and wxCombobox now handle their size in the same way as in all the
   other ports under MSW, new code is actually correct but different from weird
   stuff they were doing before so the behaviour of your programs might change
+- wxTaskBarIcon objects must now be destroyed before the application can exit.
+  Previously, the application terminated if there were no top level windows;
+  now it terminates if there are no top level windows or taskbar icons left.
+
+wxTaskBarIcon must be explicitly destroyed now, otherwise the application
+  won't exit even though there are no top level windows
 
 
 DEPRECATED METHODS SINCE 2.4.x
@@ -83,6 +89,8 @@ All (GUI):
 
 - wxHtmlWindow now delays image scaling until rendering,
   resulting in much better display of scaled images
+- Added UpdateSize to wxSplitterWindow to allow layout
+  while hidden
 
 wxMSW:
 
@@ -92,6 +100,17 @@ wxMSW:
 - wxMenuBar::GetLabelTop() doesn't include '&'s in the label any more
 - wxRegConf couldn't read global settings without admin privileges and didn't
   even try to do it by default -- now it does
+- wxTaskBarIcon must be explicitly destroyed now, otherwise the application
+  won't exit even though there are no top level windows
+
+wxMotif:
+
+- removed wxMenuItem::DeleteSubMenu()
+
+wxHTML:
+
+- improved tables and lists layout algorithms (Tim Kosse)
+- <div> handling fix (Xavier Nodet)
 
 
 2.5.1

docs/latex/wx/brush.tex

@@ -96,6 +96,7 @@ Copy constructor. This uses reference counting so is a cheap operation.
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf wxTRANSPARENT}}{Transparent (no fill).}
 \twocolitem{{\bf wxSOLID}}{Solid.}
+\twocolitem{{\bf wxSTIPPLE}}{Uses a bitmap as a stipple.}
 \twocolitem{{\bf wxBDIAGONAL\_HATCH}}{Backward diagonal hatch.}
 \twocolitem{{\bf wxCROSSDIAG\_HATCH}}{Cross-diagonal hatch.}
 \twocolitem{{\bf wxFDIAGONAL\_HATCH}}{Forward diagonal hatch.}

docs/latex/wx/checklst.tex

@@ -7,6 +7,9 @@ class under Windows wxWindows must be compiled with USE\_OWNER\_DRAWN set to 1.
 
 Only the new functions for this class are documented; see also \helpref{wxListBox}{wxlistbox}.
 
+Please note that wxCheckListBox uses client data in its implementation,
+and therefore this is not available to the application.
+
 \wxheading{Derived from}
 
 \helpref{wxListBox}{wxlistbox}\\

docs/latex/wx/dc.tex

@@ -684,13 +684,12 @@ instead.
 
 Gets the current pen (see \helpref{wxDC::SetPen}{wxdcsetpen}).
 
-
 \membersection{wxDC::GetPixel}\label{wxdcgetpixel}
 
 \func{bool}{GetPixel}{\param{wxCoord}{ x}, \param{wxCoord}{ y}, \param{wxColour *}{colour}}
 
-Sets {\it colour} to the colour at the specified location. Windows only; an X implementation
-is being worked on. Not available for wxPostScriptDC or wxMetafileDC.
+Sets {\it colour} to the colour at the specified location.
+Not available for wxPostScriptDC or wxMetafileDC.
 
 \pythonnote{For wxPython the wxColour value is returned and is not
 required as a parameter.}
@@ -698,17 +697,20 @@ required as a parameter.}
 \perlnote{This method only takes the parameters {\tt x} and {\tt y} and returns
 a Wx::Colour value}
 
+\membersection{wxDC::GetPPI}\label{wxdcgetppi}
+
+\constfunc{wxSize}{GetPPI}{\void}
+
+Returns the resolution of the device in pixels per inch.
 
 \membersection{wxDC::GetSize}\label{wxdcgetsize}
 
-\func{void}{GetSize}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
+\constfunc{void}{GetSize}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
 
-For a PostScript device context, this gets the maximum size of graphics
-drawn so far on the device context.
+\constfunc{wxSize}{GetSize}{\void}
 
-For a Windows printer device context, this gets the horizontal and vertical
-resolution. It can be used to scale graphics to fit the page when using
-a Windows printer device context. For example, if {\it maxX} and {\it maxY}\rtfsp
+This gets the horizontal and vertical resolution in device units. It can be used to scale graphics to fit the page.
+For example, if {\it maxX} and {\it maxY}\rtfsp
 represent the maximum horizontal and vertical `pixel' values used in your
 application, the following code will scale the graphic to fit on the
 printer page:
@@ -737,6 +739,13 @@ implements the following methods:\par
 \end{twocollist}
 }}
 
+\membersection{wxDC::GetSizeMM}\label{wxdcgetsizemm}
+
+\constfunc{void}{GetSizeMM}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
+
+\constfunc{wxSize}{GetSizeMM}{\void}
+
+Returns the horizontal and vertical resolution in millimetres.
 
 \membersection{wxDC::GetTextBackground}\label{wxdcgettextbackground}
 
@@ -1038,12 +1047,10 @@ user scale} (see \helpref{wxDC::SetUserScale}{wxdcsetuserscale}) scales the text
 Windows, scalable TrueType fonts are always used; in X, results depend
 on availability of fonts, but usually a reasonable match is found.
 
-Note that the coordinate origin should ideally be selectable, but for
-now is always at the top left of the screen/printer.
+The coordinate origin is always at the top left of the screen/printer.
 
-Drawing to a Windows printer device context under UNIX
-uses the current mapping mode, but mapping mode is currently ignored for
-PostScript output.
+Drawing to a Windows printer device context uses the current mapping mode,
+but mapping mode is currently ignored for PostScript output.
 
 The mapping mode can be one of the following:
 

docs/latex/wx/helpprov.tex

@@ -28,12 +28,13 @@ No base class
 
 Virtual destructor for any base class.
 
-\membersection{wxHelpProvider::Set}\label{wxhelpproviderset}
+\membersection{wxHelpProvider::AddHelp}\label{wxhelpprovideraddhelp}
 
-\func{wxHelpProvider*}{Set}{\param{wxHelpProvider* }{helpProvider}}
+\func{void}{AddHelp}{\param{wxWindowBase* }{window}, \param{const wxString\& }{text}}
 
-Get/set the current, application-wide help provider. Returns
-the previous one.
+Associates the text with the given window or id. Although all help
+providers have these functions to allow making \helpref{wxWindow::SetHelpText}{wxwindowsethelptext} 
+work, not all of them implement the functions.
 
 \membersection{wxHelpProvider::Get}\label{wxhelpproviderget}
 
@@ -50,24 +51,6 @@ Gets the help string for this window. Its interpretation is dependent on the hel
 except that empty string always means that no help is associated with
 the window.
 
-\membersection{wxHelpProvider::ShowHelp}\label{wxhelpprovidershowhelp}
-
-\func{bool}{ShowHelp}{\param{wxWindowBase* }{window}}
-
-Shows help for the given window. Uses \helpref{GetHelp}{wxhelpprovidergethelp} internally if
-applicable.
-
-Returns true if it was done, or false if no help was available
-for this window.
-
-\membersection{wxHelpProvider::AddHelp}\label{wxhelpprovideraddhelp}
-
-\func{void}{AddHelp}{\param{wxWindowBase* }{window}, \param{const wxString\& }{text}}
-
-Associates the text with the given window or id. Although all help
-providers have these functions to allow making \helpref{wxWindow::SetHelpText}{wxwindowsethelptext} 
-work, not all of them implement the functions.
-
 \func{void}{AddHelp}{\param{wxWindowID }{id}, \param{const wxString\& }{text}}
 
 This version associates the given text with all windows with this id.
@@ -82,3 +65,20 @@ Removes the association between the window pointer and the help text. This is
 called by the wxWindow destructor. Without this, the table of help strings will fill up
 and when window pointers are reused, the wrong help string will be found.
 
+\membersection{wxHelpProvider::Set}\label{wxhelpproviderset}
+
+\func{wxHelpProvider*}{Set}{\param{wxHelpProvider* }{helpProvider}}
+
+Get/set the current, application-wide help provider. Returns
+the previous one.
+
+\membersection{wxHelpProvider::ShowHelp}\label{wxhelpprovidershowhelp}
+
+\func{bool}{ShowHelp}{\param{wxWindowBase* }{window}}
+
+Shows help for the given window. Uses \helpref{GetHelp}{wxhelpprovidergethelp} internally if
+applicable.
+
+Returns true if it was done, or false if no help was available
+for this window.
+

docs/latex/wx/htmltags.tex

@@ -130,6 +130,7 @@ TD              ALIGN=[alignment]
                 WIDTH=[percent|pixels]
                 COLSPAN=[pixels]
                 ROWSPAN=[pixels]
+                NOWRAP
 TH              ALIGN=[alignment]
                 VALIGN=[v_alignment]
                 BGCOLOR=[color]

docs/latex/wx/menuitem.tex

@@ -59,12 +59,6 @@ Destructor.
 
 Checks or unchecks the menu item.
 
-\membersection{wxMenuItem::DeleteSubMenu}\label{wxmenuitemdeletesubmenu}
-
-\func{void}{DeleteSubMenu}{\void}
-
-Deletes the submenu, if any.
-
 \membersection{wxMenuItem::Enable}\label{wxmenuitemenable}
 
 \func{void}{Enable}{\param{bool}{ enable}}

docs/latex/wx/pen.tex

@@ -275,7 +275,7 @@ function is called with a NULL array.
 
 \membersection{wxPen::SetJoin}\label{wxpensetjoin}
 
-\func{void}{SetJoin}{\param{int}{join\_style}}
+\func{void}{SetJoin}{\param{int }{join\_style}}
 
 Sets the pen join style, which may be one of {\bf wxJOIN\_BEVEL}, {\bf wxJOIN\_ROUND} and
 \rtfsp{\bf wxJOIN\_MITER}. The default is {\bf wxJOIN\_ROUND}.

docs/latex/wx/print.tex

@@ -395,7 +395,7 @@ Copy constructor.
 
 Construct an object from a print dialog data object.
 
-\membersection{wxPrintDialogData::\destruct{wxprintdialogdata}}
+\membersection{wxPrintDialogData::\destruct{wxPrintDialogData}}
 
 \func{}{\destruct{wxPrintDialogData}}{\void}
 

docs/latex/wx/splitter.tex

@@ -419,3 +419,17 @@ which can be overridden for the desired behaviour. By default, the pane being re
 \helpref{wxSplitterWindow::SplitHorizontally}{wxsplitterwindowsplithorizontally}, \helpref{wxSplitterWindow::SplitVertically}{wxsplitterwindowsplitvertically},\rtfsp
 \helpref{wxSplitterWindow::IsSplit}{wxsplitterwindowissplit}, \helpref{wxSplitterWindow::OnUnsplit}{wxsplitterwindowonunsplit}
 
+\membersection{wxSplitterWindow::UpdateSize}\label{wxsplitterwindowupdatesize}
+
+\func{void}{UpdateSize}{\void}
+
+Causes any pending sizing of the sash and child panes to take place
+immediately.
+
+Such resizing normally takes place in idle time, in order
+to wait for layout to be completed. However, this can cause
+unacceptable flicker as the panes are resized after the window has been
+shown. To work around this, you can perform window layout (for
+example by sending a size event to the parent window), and then
+call this function, before showing the top-level window.
+

docs/latex/wx/window.tex

@@ -2001,7 +2001,7 @@ be treated as damaged.}
 
 \membersection{wxWindow::RefreshRect}\label{wxwindowrefreshrect}
 
-\func{void}{Refresh}{\param{const wxRect\& }{rect}}
+\func{void}{RefreshRect}{\param{const wxRect\& }{rect}}
 
 Redraws the contents of the given rectangle: the area inside it will be
 repainted.

docs/toback24.txt

@@ -278,6 +278,34 @@ Checking in src/msw/tbar95.cpp;
 new revision: 1.121; previous revision: 1.120
 done
 
+
+38. Implement wxBitmapButton::DoGetBestSize
+
+Checking in include/wx/gtk/bmpbuttn.h;
+/pack/cvsroots/wxwidgets/wxWidgets/include/wx/gtk/bmpbuttn.h,v  <--  bmpbuttn.h
+new revision: 1.24; previous revision: 1.23
+done
+Checking in src/gtk/bmpbuttn.cpp;
+/pack/cvsroots/wxwidgets/wxWidgets/src/gtk/bmpbuttn.cpp,v  <--  bmpbuttn.cpp
+new revision: 1.46; previous revision: 1.45
+done
+Checking in include/wx/msw/bmpbuttn.h;
+/pack/cvsroots/wxwidgets/wxWidgets/include/wx/msw/bmpbuttn.h,v  <--  bmpbuttn.h
+new revision: 1.12; previous revision: 1.11
+done
+Checking in src/msw/bmpbuttn.cpp;
+/pack/cvsroots/wxwidgets/wxWidgets/src/msw/bmpbuttn.cpp,v  <--  bmpbuttn.cpp
+new revision: 1.45; previous revision: 1.44
+done
+Checking in include/wx/mac/bmpbuttn.h;
+/pack/cvsroots/wxwidgets/wxWidgets/include/wx/mac/bmpbuttn.h,v  <--  bmpbuttn.h
+new revision: 1.10; previous revision: 1.9
+done
+Checking in src/mac/bmpbuttn.cpp;
+/pack/cvsroots/wxwidgets/wxWidgets/src/mac/bmpbuttn.cpp,v  <--  bmpbuttn.cpp
+new revision: 1.26; previous revision: 1.25
+done
+
 =======
 
 

include/wx/cocoa/dc.h

@@ -46,7 +46,7 @@ protected:
     bool CocoaUnwindStackAndTakeFocus();
     inline bool CocoaTakeFocus()
     {
-        wxCocoaDCStack::Node *node = sm_cocoaDCStack.GetFirst();
+        wxCocoaDCStack::compatibility_iterator node = sm_cocoaDCStack.GetFirst();
         if(node && (node->GetData() == this))
             return true;
         return CocoaUnwindStackAndTakeFocus();

include/wx/cocoa/menu.h

@@ -87,8 +87,6 @@ protected:
 // Implementation
 // ------------------------------------------------------------------------
 public:
-    wxMenuItemList m_items;             // the list of menu items
-
     // implement base class virtuals
     virtual bool Append(wxMenu *menu, const wxString &title);
     virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);

include/wx/dataobj.h

@@ -335,21 +335,35 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
+
+#if wxUSE_UNICODE && defined(__WXGTK20__)
+    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const { return 2; }
+    virtual void GetAllFormats(wxDataFormat *formats,
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const;
+                               
+    virtual size_t GetDataSize() const { return GetDataSize(GetPreferredFormat()); }
+    virtual bool GetDataHere(void *buf) const { return GetDataHere(GetPreferredFormat(), buf); }
+    virtual bool SetData(size_t len, const void *buf) { return SetData(GetPreferredFormat(), len, buf); }
+
+    size_t GetDataSize(const wxDataFormat& format) const;
+    bool GetDataHere(const wxDataFormat& format, void *pBuf) const;
+    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf);
+#else
     virtual size_t GetDataSize() const;
     virtual bool GetDataHere(void *buf) const;
     virtual bool SetData(size_t len, const void *buf);
 
-private:
-    wxString m_text;
-
-    // virtual function hiding supression
     size_t GetDataSize(const wxDataFormat& format) const
         { return(wxDataObjectSimple::GetDataSize(format)); }
     bool GetDataHere(const wxDataFormat& format, void *pBuf) const
         { return(wxDataObjectSimple::GetDataHere(format, pBuf)); }
     bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf)
         { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); }
+#endif
 
+private:
+    wxString m_text;
+    
     DECLARE_NO_COPY_CLASS(wxTextDataObject)
 };
 

include/wx/defs.h

@@ -2035,6 +2035,8 @@ enum wxUpdateUI
 
 #ifdef __WXMAC__
 
+#define WX_OPAQUE_TYPE( name ) struct wxOpaque##name
+
 typedef unsigned char WXCOLORREF[6];
 typedef void*       WXHBITMAP;
 typedef void*       WXHMETAFILE;
@@ -2054,8 +2056,11 @@ typedef unsigned int    WXUINT;
 typedef unsigned long   WXDWORD;
 typedef unsigned short  WXWORD;
 
-typedef void*       WXWidget;
-typedef void*       WXWindow;
+
+//typedef void*       WXWidget;
+//typedef void*       WXWindow;
+typedef WX_OPAQUE_TYPE(ControlRef ) * WXWidget ;
+typedef WX_OPAQUE_TYPE(WindowRef) * WXWindow ;
 typedef void*       WXDisplay;
 
 /* typedef WindowPtr       WXHWND; */

include/wx/generic/splitter.h

@@ -129,6 +129,11 @@ public:
     // parameter should be NULL)
     bool ReplaceWindow(wxWindow *winOld, wxWindow *winNew);
 
+    // Make sure the child window sizes are updated. This is useful
+    // for reducing flicker by updating the sizes before a
+    // window is shown, if you know the overall size is correct.
+    void UpdateSize();
+
     // Is the window split?
     bool IsSplit() const { return (m_windowTwo != NULL); }
 

include/wx/gtk/bmpbuttn.h

@@ -68,6 +68,7 @@ public:
 
 protected:
     virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
 
     void Init();
 

include/wx/gtk/menu.h

@@ -48,8 +48,9 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title);
 
+#ifndef __WXGTK20__
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
+#endif
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
@@ -87,7 +88,6 @@ public:
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
 
 private:
     // common code for all constructors:
@@ -96,9 +96,7 @@ private:
     // common part of Append and Insert
     bool GtkAppend(wxMenuItem *item);
 
-    // if the last menu item was a radio one, this field contains its path,
-    // otherwise it is empty
-    wxString m_pathLastRadio;
+	GtkWidget *m_prevRadio;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };

include/wx/gtk/msgdlg.h

@@ -38,7 +38,6 @@ private:
     wxString m_caption;
     wxString m_message;
     long m_dialogStyle;
-    wxWindow *m_parent;
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };

include/wx/gtk/notebook.h

@@ -106,6 +106,9 @@ public:
     bool DoPhase(int phase);
 #endif
 
+    // set all page's font
+    bool SetFont(const wxFont& font);
+    
     void ApplyWidgetStyle();
 
     // report if window belongs to notebook

include/wx/gtk1/bmpbuttn.h

@@ -68,6 +68,7 @@ public:
 
 protected:
     virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
 
     void Init();
 

include/wx/gtk1/menu.h

@@ -48,8 +48,9 @@ public:
     // common part of Append and Insert
     bool GtkAppend(wxMenu *menu, const wxString& title);
 
+#ifndef __WXGTK20__
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
+#endif
     GtkWidget       *m_menubar;
     long             m_style;
     wxWindow        *m_invokingWindow;
@@ -87,7 +88,6 @@ public:
     GtkWidget       *m_menu;  // GtkMenu
     GtkWidget       *m_owner;
     GtkAccelGroup   *m_accel;
-    GtkItemFactory  *m_factory;
 
 private:
     // common code for all constructors:
@@ -96,9 +96,7 @@ private:
     // common part of Append and Insert
     bool GtkAppend(wxMenuItem *item);
 
-    // if the last menu item was a radio one, this field contains its path,
-    // otherwise it is empty
-    wxString m_pathLastRadio;
+	GtkWidget *m_prevRadio;
 
     DECLARE_DYNAMIC_CLASS(wxMenu)
 };

include/wx/gtk1/msgdlg.h

@@ -38,7 +38,6 @@ private:
     wxString m_caption;
     wxString m_message;
     long m_dialogStyle;
-    wxWindow *m_parent;
 
     DECLARE_DYNAMIC_CLASS(wxMessageDialog)
 };

include/wx/gtk1/notebook.h

@@ -106,6 +106,9 @@ public:
     bool DoPhase(int phase);
 #endif
 
+    // set all page's font
+    bool SetFont(const wxFont& font);
+    
     void ApplyWidgetStyle();
 
     // report if window belongs to notebook

include/wx/html/htmlcell.h

@@ -172,6 +172,11 @@ public:
     int GetPosX() const {return m_PosX;}
     int GetPosY() const {return m_PosY;}
     int GetWidth() const {return m_Width;}
+    
+    // Returns the maximum possible length of the cell.
+    // Call Layout at least once before using GetMaxTotalWidth()
+    virtual int GetMaxTotalWidth() const { return m_Width; }
+
     int GetHeight() const {return m_Height;}
     int GetDescent() const {return m_Descent;}
 
@@ -428,6 +433,10 @@ public:
     // below first/last terminal cell). For internal use only.
     void RemoveExtraSpacing(bool top, bool bottom);
 
+    // Returns the maximum possible length of the container.
+    // Call Layout at least once before using GetMaxTotalWidth()
+    virtual int GetMaxTotalWidth() const { return m_MaxTotalWidth; }
+
 protected:
     void UpdateRenderingStatePre(wxHtmlRenderingInfo& info,
                                  wxHtmlCell *cell) const;
@@ -457,7 +466,10 @@ protected:
     int m_LastLayout;
             // if != -1 then call to Layout may be no-op
             // if previous call to Layout has same argument
+    int m_MaxTotalWidth;
+            // Maximum possible length if ignoring line wrap
 
+    
     DECLARE_ABSTRACT_CLASS(wxHtmlContainerCell)
     DECLARE_NO_COPY_CLASS(wxHtmlContainerCell)
 };

include/wx/intl.h

@@ -371,29 +371,36 @@ public:
     // -----------
 
         // call Init() if you use this ctor
-    wxLocale();
+    wxLocale() { DoCommonInit(); }
+
         // the ctor has a side effect of changing current locale
     wxLocale(const wxChar *szName,                               // name (for messages)
              const wxChar *szShort = (const wxChar *) NULL,      // dir prefix (for msg files)
              const wxChar *szLocale = (const wxChar *) NULL,     // locale (for setlocale)
-             bool bLoadDefault = TRUE,                           // preload wxstd.mo?
-             bool bConvertEncoding = FALSE)                      // convert Win<->Unix if neccessary?
+             bool bLoadDefault = true,                           // preload wxstd.mo?
+             bool bConvertEncoding = false)                      // convert Win<->Unix if neccessary?
         {
+            DoCommonInit();
+
             Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding);
         }
 
     wxLocale(int language, // wxLanguage id or custom language
              int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING)
-        { Init(language, flags); }
+        {
+            DoCommonInit();
 
-        // the same as a function (returns TRUE on success)
+            Init(language, flags);
+        }
+
+        // the same as a function (returns true on success)
     bool Init(const wxChar *szName,
               const wxChar *szShort = (const wxChar *) NULL,
               const wxChar *szLocale = (const wxChar *) NULL,
-              bool bLoadDefault = TRUE,
-              bool bConvertEncoding = FALSE);
+              bool bLoadDefault = true,
+              bool bConvertEncoding = false);
 
-        // same as second ctor (returns TRUE on success)
+        // same as second ctor (returns true on success)
     bool Init(int language = wxLANGUAGE_DEFAULT,
               int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);
 
@@ -416,7 +423,7 @@ public:
     // is used, the US default value is returned if everything else fails
     static wxString GetInfo(wxLocaleInfo index, wxLocaleCategory cat);
 
-    // return TRUE if the locale was set successfully
+    // return true if the locale was set successfully
     bool IsOk() const { return m_pszOldLocale != NULL; }
 
     // returns locale name
@@ -509,6 +516,9 @@ private:
     // m_langugagesInfo, called by InitLanguagesDB
     static void InitLanguagesDB();
 
+    // initialize the member fields to default values
+    void DoCommonInit();
+
     wxString       m_strLocale,       // this locale name
                    m_strShort;        // short name for the locale
     int            m_language;        // this locale wxLanguage value

include/wx/mac/accel.h

@@ -1,53 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ACCEL_H_
-#define _WX_ACCEL_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "accel.h"
-#endif
-
-#include "wx/string.h"
-#include "wx/event.h"
-
-class WXDLLEXPORT wxAcceleratorTable: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
-
-    // Copy constructors
-    wxAcceleratorTable(const wxAcceleratorTable& accel)
-        : wxObject()
-    { Ref(accel); }
-    wxAcceleratorTable(const wxAcceleratorTable* accel)
-    { if (accel) Ref(*accel); }
-
-    ~wxAcceleratorTable();
-
-    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
-    { if (*this == accel) return (*this); Ref(accel); return *this; }
-    bool operator == (const wxAcceleratorTable& accel)
-    { return m_refData == accel.m_refData; }
-    bool operator != (const wxAcceleratorTable& accel)
-    { return m_refData != accel.m_refData; }
-
-    bool Ok() const;
-
-    int GetCommand( wxKeyEvent &event );
-};
-
-// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
-
-#endif
-    // _WX_ACCEL_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/accel.h"
+#else
+#include "wx/mac/carbon/accel.h"
+#endif

include/wx/mac/app.h

@@ -1,207 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
-// Purpose:     wxApp class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "app.h"
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdicmn.h"
-#include "wx/event.h"
-
-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindowMac;
-class WXDLLEXPORT wxApp ;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
-
-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-
-// Force an exit from main loop
-void WXDLLEXPORT wxExit();
-
-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield();
-
-// Represents the application. Derive OnInit and declare
-// a new App object to start application
-class WXDLLEXPORT wxApp: public wxAppBase
-{
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
-    wxApp();
-    virtual ~wxApp() {}
-
-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Pending() ;
-    virtual bool Dispatch() ;
-
-    virtual void Exit();
-
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
-    virtual void WakeUpIdle();
-
-    virtual void SetPrintMode(int mode) { m_printMode = mode; }
-    virtual int GetPrintMode() const { return m_printMode; }
-
-#if wxUSE_GUI
-    // setting up all MacOS Specific Event-Handlers etc
-    virtual bool OnInitGui();
-#endif // wxUSE_GUI
-    // implementation only
-    void OnIdle(wxIdleEvent& event);
-    void OnEndSession(wxCloseEvent& event);
-    void OnQueryEndSession(wxCloseEvent& event);
-
-    // Windows only, but for compatibility...
-    inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-    inline bool GetAuto3D() const { return m_auto3D; }
-
-protected:
-    bool                  m_showOnInit;
-    int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-    bool                  m_auto3D ;   // Always use 3D controls, except
-                                       // where overriden
-public:
-
-    static bool           sm_isEmbedded;
-    // Implementation
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
-
-    bool IsExiting() { return !m_keepGoing ; }
-#if TARGET_CARBON
-    // the installed application event handler
-    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
-    WXEVENTHANDLERREF    MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
-    void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
-    { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
-#endif
-
-public:
-    static long           sm_lastMessageTime;
-    static wxWindow*      s_captureWindow ;
-    static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
-    static WXHRGN         s_macCursorRgn ;
-    static long           s_lastModifiers ;
-
-    int                   m_nCmdShow;
-
-private:
-    bool                  m_keepGoing ;
-
-    // mac specifics
-#if TARGET_CARBON
-    WXEVENTHANDLERREF     m_macEventHandler ;
-    WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
-#endif
-    WXEVENTREF            m_macCurrentEvent ;
-
-public:
-    static bool           s_macSupportPCMenuShortcuts ;
-    static long           s_macAboutMenuItemId ;
-    static long           s_macPreferencesMenuItemId ;
-    static long           s_macExitMenuItemId ;
-    static wxString       s_macHelpMenuTitleName ;
-
-    static bool           s_macHasAppearance ;
-    static long           s_macAppearanceVersion ;
-    static bool           s_macHasNavigation ;
-    static bool           s_macNavigationVersion ;
-    static bool           s_macHasWindowManager ;
-    static long           s_macWindowManagerVersion ;
-    static bool           s_macHasMenuManager ;
-    static long           s_macMenuManagerVersion ;
-    static bool           s_macHasDialogManager ;
-    static long           s_macDialogManagerVersion ;
-
-    WXHRGN                m_macCursorRgn ;
-    WXHRGN                m_macSleepRgn ;
-    WXHRGN                m_macHelpRgn ;
-
-    virtual void          MacSuspend( bool convertClipboard ) ;
-    virtual void          MacResume( bool convertClipboard ) ;
-    virtual void          MacConvertPrivateToPublicScrap() ;
-    virtual void          MacConvertPublicToPrivateScrap() ;
-
-    void                  MacDoOneEvent() ;
-    WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
-    void                  MacHandleOneEvent( WXEVENTREF ev ) ;
-
-    // For embedded use. By default does nothing.
-    virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
-
-#if !TARGET_CARBON
-    virtual void          MacHandleMenuSelect( int menuid , int menuitem ) ;
-    virtual void          MacHandleMouseUpEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleOSEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleDiskEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleActivateEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleUpdateEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleMouseDownEvent( WXEVENTREF ev ) ;
-
-    void                  MacHandleModifierEvents( WXEVENTREF ev ) ;
-
-    virtual void          MacHandleKeyDownEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleKeyUpEvent( WXEVENTREF ev ) ;
-    virtual void          MacHandleHighLevelEvent( WXEVENTREF ev ) ;
-
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/app.h"
 #else
-    virtual void          MacHandleMouseMovedEvent( wxInt32 x , wxInt32 y ,wxUint32 modifiers , long timestamp ) ;
-#endif
-
-    void                  MacHandleMenuCommand( wxUint32 command ) ;
-    bool                    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
-    bool                    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
-
-    virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAERApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-
-    // in response of an open-document apple event
-    virtual void         MacOpenFile(const wxString &fileName) ;
-    // in response of a print-document apple event
-    virtual void         MacPrintFile(const wxString &fileName) ;
-    // in response of a open-application apple event
-    virtual void         MacNewFile() ;
-    // in response of a reopen-application apple event
-    virtual void         MacReopenApp() ;
-
-    DECLARE_EVENT_TABLE()
-};
-
-class WXDLLEXPORT wxStAppResource
-{
-public:
-    wxStAppResource() ;
-    ~wxStAppResource() ;
-
-    // opaque pointer for CFragInitBlock
-    static void OpenSharedLibraryResource(const void *) ;
-    static void CloseSharedLibraryResource() ;
-
-private:
-    short       m_currentRefNum ;
-} ;
-
-#endif
-    // _WX_APP_H_
-
+#include "wx/mac/carbon/app.h"
+#endif

include/wx/mac/apptbase.h

@@ -1,39 +1,5 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/apptbase.h
-// Purpose:     declaration of wxAppTraits for Mac systems
-// Author:      Vadim Zeitlin
-// Modified by: Stefan Csomor
-// Created:     23.06.2003
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_APPTBASE_H_
-#define _WX_MAC_APPTBASE_H_
-
-// ----------------------------------------------------------------------------
-// wxAppTraits: the Mac version adds extra hooks needed by Mac code
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
-{
-public:
-    // wxExecute() support methods
-    // ---------------------------
-
-    // TODO
-
-    // wxThread helpers
-    // ----------------
-
-
-    // TODO
-
-    // other miscellaneous helpers
-    // ---------------------------
-
-};
-
-#endif // _WX_MAC_APPTBASE_H_
-
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/apptbase.h"
+#else
+#include "wx/mac/carbon/apptbase.h"
+#endif

include/wx/mac/apptrait.h

@@ -1,42 +1,5 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/apptrait.h
-// Purpose:     standard implementations of wxAppTraits for MacOS
-// Author:      Vadim Zeitlin
-// Modified by: Stefan Csomor
-// Created:     23.06.2003
-// RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_APPTRAIT_H_
-#define _WX_MAC_APPTRAIT_H_
-
-// ----------------------------------------------------------------------------
-// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-    // other miscellaneous helpers
-    // ---------------------------
-
-    virtual wxToolkitInfo& GetToolkitInfo();
-};
-
-#if wxUSE_GUI
-
-class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    // other miscellaneous helpers
-    // ---------------------------
-
-    virtual wxToolkitInfo& GetToolkitInfo();
-};
-
-#endif // wxUSE_GUI
-
-#endif // _WX_MAC_APPTRAIT_H_
-
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/apptrait.h"
+#else
+#include "wx/mac/carbon/apptrait.h"
+#endif

include/wx/mac/bitmap.h

@@ -1,225 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bitmap.h
-// Purpose:     wxBitmap class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BITMAP_H_
-#define _WX_BITMAP_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma interface "bitmap.h"
-#endif
-
-#include "wx/palette.h"
-
-// Bitmap
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxBitmapHandler;
-class WXDLLEXPORT wxControl;
-class WXDLLEXPORT wxCursor;
-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxIcon;
-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxPixelDataBase;
-
-// A mask is a bitmap used for drawing bitmaps
-// it can be a monochrome bitmap or a multi-bit bitmap which transfers to alpha channels
-// transparently.
-class WXDLLEXPORT wxMask: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxMask)
-    DECLARE_NO_COPY_CLASS(wxMask)
-
-public:
-  wxMask();
-
-  // Construct a mask from a bitmap and a colour indicating
-  // the transparent area
-  wxMask(const wxBitmap& bitmap, const wxColour& colour);
-
-  // Construct a mask from a bitmap and a palette index indicating
-  // the transparent area
-  wxMask(const wxBitmap& bitmap, int paletteIndex);
-
-  // Construct a mask from a mono bitmap (copies the bitmap).
-  wxMask(const wxBitmap& bitmap);
-
-  ~wxMask();
-
-  bool Create(const wxBitmap& bitmap, const wxColour& colour);
-  bool Create(const wxBitmap& bitmap, int paletteIndex);
-  bool Create(const wxBitmap& bitmap);
-
-  // Implementation
-  bool PointMasked(int x, int y);
-  inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
-  inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
-  int GetDepth() const { return m_depth ; }
-  void SetDepth( int depth ) { m_depth = depth ; }
-protected:
-  WXHBITMAP m_maskBitmap;
-  int m_depth ;
-};
-
-enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
-
-class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
-{
-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
-        
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxIcon;
-    friend class WXDLLEXPORT wxCursor;
-public:
-    wxBitmapRefData();
-    ~wxBitmapRefData();
-
-public:
-  int           m_width;
-  int           m_height;
-  int           m_depth;
-  bool          m_ok;
-  int           m_numColors;
-#if wxUSE_PALETTE
-  wxPalette     m_bitmapPalette;
-#endif // wxUSE_PALETTE
-  int           m_quality;
-
-  int            m_bitmapType ;
-  WXHMETAFILE    m_hPict ;
-  WXHBITMAP     m_hBitmap;
-  WXHICON       m_hIcon ;
-  wxMask *      m_bitmapMask; // Optional mask
-  bool          m_hasAlpha;
-};
-
-#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
-
-class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-public:
-  wxBitmapHandler() : m_name(), m_extension(), m_type(0) { }
-  virtual ~wxBitmapHandler();
-
-  virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-  virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-
-  void SetName(const wxString& name) { m_name = name; }
-  void SetExtension(const wxString& ext) { m_extension = ext; }
-  void SetType(long type) { m_type = type; }
-  wxString GetName() const { return m_name; }
-  wxString GetExtension() const { return m_extension; }
-  long GetType() const { return m_type; }
-
-protected:
-  wxString  m_name;
-  wxString  m_extension;
-  long      m_type;
-};
-
-#define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
-
-class WXDLLEXPORT wxBitmap: public wxBitmapBase
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmap)
-
-  friend class WXDLLEXPORT wxBitmapHandler;
-
-public:
-  wxBitmap(); // Platform-specific
-
-  // Copy constructors
-  wxBitmap(const wxBitmap& bitmap)
-      : wxBitmapBase()
-  { Ref(bitmap); }
-
-  // Initialize with raw data.
-  wxBitmap(const char bits[], int width, int height, int depth = 1);
-
-  // Initialize with XPM data
-  bool CreateFromXpm(const char **bits);
-  wxBitmap(const char **bits);
-  wxBitmap(char **bits);
-
-  // Load a file or resource
-  wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_PICT_RESOURCE);
-
-  // Constructor for generalised creation from data
-  wxBitmap(void *data, wxBitmapType type, int width, int height, int depth = 1);
-
-  // If depth is omitted, will create a bitmap compatible with the display
-  wxBitmap(int width, int height, int depth = -1);
-  
-  // Convert from wxImage:
-  wxBitmap(const wxImage& image, int depth = -1);
-  
-  ~wxBitmap();
-  
-  wxImage ConvertToImage() const;
-
-  // get the given part of bitmap
-  wxBitmap GetSubBitmap( const wxRect& rect ) const;
-
-  virtual bool Create(int width, int height, int depth = -1);
-  virtual bool Create(void *data, wxBitmapType type, int width, int height, int depth = 1);
-  virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
-  virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
-
-  // copies the contents and mask of the given (colour) icon to the bitmap
-  virtual bool CopyFromIcon(const wxIcon& icon);
-
-  bool Ok() const;
-  int GetWidth() const;
-  int GetHeight() const;
-  int GetDepth() const;
-  int GetQuality() const;
-  void SetWidth(int w);
-  void SetHeight(int h);
-  void SetDepth(int d);
-  void SetQuality(int q);
-  void SetOk(bool isOk);
-
-#if wxUSE_PALETTE
-   wxPalette* GetPalette() const;
-   void SetPalette(const wxPalette& palette);
-#endif // wxUSE_PALETTE
-
-  wxMask *GetMask() const;
-  void SetMask(wxMask *mask) ;
-
-  int GetBitmapType() const;
-  
-  inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
-  inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
-  inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
-
-  static void InitStandardHandlers();
-
-    // raw bitmap access support functions, for internal use only
-    void *GetRawData(wxPixelDataBase& data, int bpp);
-    void UngetRawData(wxPixelDataBase& data);
-
-    void UseAlpha();
-
-public:
-  WXHBITMAP GetHBITMAP() const;
-  inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
-  WXHMETAFILE GetPict(bool *created = NULL ) const;
-
-  void SetHBITMAP(WXHBITMAP bmp);
-  void SetHICON(WXHICON ico);
-  void SetPict( WXHMETAFILE pict ) ;
-
-  bool FreeResource(bool force = FALSE);
-};
-#endif
-  // _WX_BITMAP_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/bitmap.h"
+#else
+#include "wx/mac/carbon/bitmap.h"
+#endif

include/wx/mac/bmpbuttn.h

@@ -1,62 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        bmpbuttn.h
-// Purpose:     wxBitmapButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BMPBUTTN_H_
-#define _WX_BMPBUTTN_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "bmpbuttn.h"
-#endif
-
-#include "wx/button.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-
-public:
-    wxBitmapButton()
-        {
-            SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
-        }
-    
-    wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
-        {
-            Create(parent, id, bitmap, pos, size, style, validator, name);
-        }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
-
-    virtual void SetBitmapLabel(const wxBitmap& bitmap);
-
-/*
-  // TODO: Implementation
-  virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-  virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-  virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-  virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
-*/
-};
-
-#endif
-    // _WX_BMPBUTTN_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/bmpbuttn.h"
+#else
+#include "wx/mac/carbon/bmpbuttn.h"
+#endif

include/wx/mac/brush.h

@@ -1,82 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        brush.h
-// Purpose:     wxBrush class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BRUSH_H_
-#define _WX_BRUSH_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "brush.h"
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-class WXDLLEXPORT wxBrush;
-
-typedef enum 
-{
-  kwxMacBrushColour ,
-  kwxMacBrushTheme ,
-  kwxMacBrushThemeBackground
-} wxMacBrushKind ;
-
-// Brush
-class WXDLLEXPORT wxBrush: public wxGDIObject
-{
-  DECLARE_DYNAMIC_CLASS(wxBrush)
-
-public:
-  wxBrush();
-  wxBrush(short macThemeBrush ) ;
-  wxBrush(const wxColour& col, int style = wxSOLID);
-  wxBrush(const wxBitmap& stipple);
-  wxBrush(const wxBrush& brush)
-      : wxGDIObject()
-      { Ref(brush); }
-  ~wxBrush();
-
-  virtual void SetColour(const wxColour& col)  ;
-  virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
-  virtual void SetStyle(int style)  ;
-  virtual void SetStipple(const wxBitmap& stipple)  ;
-  virtual void SetMacTheme(short macThemeBrush) ;
-  virtual void SetMacThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
-
-  wxBrush& operator = (const wxBrush& brush)
-  { if (*this == brush) return (*this); Ref(brush); return *this; }
-  bool operator == (const wxBrush& brush)
-  { return m_refData == brush.m_refData; }
-  bool operator != (const wxBrush& brush)
-  { return m_refData != brush.m_refData; }
-
-  wxMacBrushKind MacGetBrushKind()  const ;
-
-  unsigned long GetMacThemeBackground(WXRECTPTR extent)  const ;
-  short GetMacTheme()  const ;
-  wxColour& GetColour() const ;
-  int GetStyle() const ;
-  wxBitmap *GetStipple() const ;
-
-  virtual bool Ok() const { return (m_refData != NULL) ; }
-
-// Implementation
-
-  // Useful helper: create the brush resource
-  bool RealizeResource();
-
-  // When setting properties, we must make sure we're not changing
-  // another object
-  void Unshare();
-};
-
-#endif
-    // _WX_BRUSH_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/brush.h"
+#else
+#include "wx/mac/carbon/brush.h"
+#endif

include/wx/mac/button.h

@@ -1,55 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
-// Purpose:     wxButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-
-#include "wx/control.h"
-#include "wx/gdicmn.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
-
-// Pushbutton
-class WXDLLEXPORT wxButton: public wxButtonBase
-{
-  DECLARE_DYNAMIC_CLASS(wxButton)
- public:
-  inline wxButton() {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
-
-    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
-    static wxSize GetDefaultSize();
-
-  virtual void SetDefault();
-  virtual void Command(wxCommandEvent& event);
-protected:
-    virtual wxSize DoGetBestSize() const ;
-};
-
-#endif
-    // _WX_BUTTON_H_
+#if __WXMAC_CLASSIC__
+#include "wx/mac/classic/button.h"
+#else
+#include "wx/mac/carbon/button.h"
+#endif

include/wx/mac/carbon/accel.h

@@ -0,0 +1,53 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.h
+// Purpose:     wxAcceleratorTable class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_ACCEL_H_
+#define _WX_ACCEL_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "accel.h"
+#endif
+
+#include "wx/string.h"
+#include "wx/event.h"
+
+class WXDLLEXPORT wxAcceleratorTable: public wxObject
+{
+DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+public:
+    wxAcceleratorTable();
+    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
+
+    // Copy constructors
+    wxAcceleratorTable(const wxAcceleratorTable& accel)
+        : wxObject()
+    { Ref(accel); }
+    wxAcceleratorTable(const wxAcceleratorTable* accel)
+    { if (accel) Ref(*accel); }
+
+    ~wxAcceleratorTable();
+
+    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel)
+    { if (*this == accel) return (*this); Ref(accel); return *this; }
+    bool operator == (const wxAcceleratorTable& accel)
+    { return m_refData == accel.m_refData; }
+    bool operator != (const wxAcceleratorTable& accel)
+    { return m_refData != accel.m_refData; }
+
+    bool Ok() const;
+
+    int GetCommand( wxKeyEvent &event );
+};
+
+// WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+
+#endif
+    // _WX_ACCEL_H_

include/wx/mac/carbon/aga.h

@@ -0,0 +1,13 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        aga.h
+// Purpose:     Gray Controls implementation
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+// NOT NEEDED ANYMORE

include/wx/mac/carbon/app.h

@@ -0,0 +1,175 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        app.h
+// Purpose:     wxApp class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_APP_H_
+#define _WX_APP_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "app.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/gdicmn.h"
+#include "wx/event.h"
+
+class WXDLLEXPORT wxFrame;
+class WXDLLEXPORT wxWindowMac;
+class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxKeyEvent;
+class WXDLLEXPORT wxLog;
+
+#define wxPRINT_WINDOWS         1
+#define wxPRINT_POSTSCRIPT      2
+
+WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
+
+// Force an exit from main loop
+void WXDLLEXPORT wxExit();
+
+// Yield to other apps/messages
+bool WXDLLEXPORT wxYield();
+
+// Represents the application. Derive OnInit and declare
+// a new App object to start application
+class WXDLLEXPORT wxApp: public wxAppBase
+{
+    DECLARE_DYNAMIC_CLASS(wxApp)
+
+    wxApp();
+    virtual ~wxApp() {}
+
+    virtual int MainLoop();
+    virtual void ExitMainLoop();
+    virtual bool Pending() ;
+    virtual bool Dispatch() ;
+
+    virtual void Exit();
+
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle();
+
+    virtual void SetPrintMode(int mode) { m_printMode = mode; }
+    virtual int GetPrintMode() const { return m_printMode; }
+
+#if wxUSE_GUI
+    // setting up all MacOS Specific Event-Handlers etc
+    virtual bool OnInitGui();
+#endif // wxUSE_GUI
+    // implementation only
+    void OnIdle(wxIdleEvent& event);
+    void OnEndSession(wxCloseEvent& event);
+    void OnQueryEndSession(wxCloseEvent& event);
+
+protected:
+    bool                  m_showOnInit;
+    int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+
+public:
+
+    static bool           sm_isEmbedded;
+    // Implementation
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+
+    bool IsExiting() { return !m_keepGoing ; }
+
+    // the installed application event handler
+    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
+    WXEVENTHANDLERREF    MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
+    void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
+    { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
+
+public:
+    static long           sm_lastMessageTime;
+    static wxWindow*      s_captureWindow ;
+    static int            s_lastMouseDown ; // 0 = none , 1 = left , 2 = right
+    static WXHRGN         s_macCursorRgn ;
+    static long           s_lastModifiers ;
+
+    int                   m_nCmdShow;
+
+private:
+    bool                  m_keepGoing ;
+
+    // mac specifics
+
+    WXEVENTHANDLERREF     m_macEventHandler ;
+    WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
+    WXEVENTREF            m_macCurrentEvent ;
+
+public:
+    static bool           s_macSupportPCMenuShortcuts ;
+    static long           s_macAboutMenuItemId ;
+    static long           s_macPreferencesMenuItemId ;
+    static long           s_macExitMenuItemId ;
+    static wxString       s_macHelpMenuTitleName ;
+
+    static bool           s_macHasAppearance ;
+    static long           s_macAppearanceVersion ;
+    static bool           s_macHasNavigation ;
+    static bool           s_macNavigationVersion ;
+    static bool           s_macHasWindowManager ;
+    static long           s_macWindowManagerVersion ;
+    static bool           s_macHasMenuManager ;
+    static long           s_macMenuManagerVersion ;
+    static bool           s_macHasDialogManager ;
+    static long           s_macDialogManagerVersion ;
+
+    WXHRGN                m_macCursorRgn ;
+    WXHRGN                m_macSleepRgn ;
+    WXHRGN                m_macHelpRgn ;
+
+    void                  MacDoOneEvent() ;
+    WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
+    void                  MacHandleOneEvent( WXEVENTREF ev ) ;
+
+    // For embedded use. By default does nothing.
+    virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
+
+    bool    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
+    bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , short wherex , short wherey ) ;
+
+    virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+    virtual short         MacHandleAERApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
+
+    // in response of an open-document apple event
+    virtual void         MacOpenFile(const wxString &fileName) ;
+    // in response of a print-document apple event
+    virtual void         MacPrintFile(const wxString &fileName) ;
+    // in response of a open-application apple event
+    virtual void         MacNewFile() ;
+    // in response of a reopen-application apple event
+    virtual void         MacReopenApp() ;
+
+    DECLARE_EVENT_TABLE()
+};
+
+class WXDLLEXPORT wxStAppResource
+{
+public:
+    wxStAppResource() ;
+    ~wxStAppResource() ;
+
+    // opaque pointer for CFragInitBlock
+    static void OpenSharedLibraryResource(const void *) ;
+    static void CloseSharedLibraryResource() ;
+
+private:
+    short       m_currentRefNum ;
+} ;
+
+#endif
+    // _WX_APP_H_
+

include/wx/mac/carbon/apptbase.h

@@ -0,0 +1,39 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mac/apptbase.h
+// Purpose:     declaration of wxAppTraits for Mac systems
+// Author:      Vadim Zeitlin
+// Modified by: Stefan Csomor
+// Created:     23.06.2003
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MAC_APPTBASE_H_
+#define _WX_MAC_APPTBASE_H_
+
+// ----------------------------------------------------------------------------
+// wxAppTraits: the Mac version adds extra hooks needed by Mac code
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
+{
+public:
+    // wxExecute() support methods
+    // ---------------------------
+
+    // TODO
+
+    // wxThread helpers
+    // ----------------
+
+
+    // TODO
+
+    // other miscellaneous helpers
+    // ---------------------------
+
+};
+
+#endif // _WX_MAC_APPTBASE_H_
+

include/wx/mac/carbon/apptrait.h

@@ -0,0 +1,42 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/mac/apptrait.h
+// Purpose:     standard implementations of wxAppTraits for MacOS
+// Author:      Vadim Zeitlin
+// Modified by: Stefan Csomor
+// Created:     23.06.2003
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_MAC_APPTRAIT_H_
+#define _WX_MAC_APPTRAIT_H_
+
+// ----------------------------------------------------------------------------
+// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase
+{
+public:
+    // other miscellaneous helpers
+    // ---------------------------
+
+    virtual wxToolkitInfo& GetToolkitInfo();
+};
+
+#if wxUSE_GUI
+
+class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase
+{
+public:
+    // other miscellaneous helpers
+    // ---------------------------
+
+    virtual wxToolkitInfo& GetToolkitInfo();
+};
+
+#endif // wxUSE_GUI
+
+#endif // _WX_MAC_APPTRAIT_H_
+

include/wx/mac/carbon/bitmap.h

@@ -0,0 +1,225 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        bitmap.h
+// Purpose:     wxBitmap class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BITMAP_H_
+#define _WX_BITMAP_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+  #pragma interface "bitmap.h"
+#endif
+
+#include "wx/palette.h"
+
+// Bitmap
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxBitmapHandler;
+class WXDLLEXPORT wxControl;
+class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxImage;
+class WXDLLEXPORT wxPixelDataBase;
+
+// A mask is a bitmap used for drawing bitmaps
+// it can be a monochrome bitmap or a multi-bit bitmap which transfers to alpha channels
+// transparently.
+class WXDLLEXPORT wxMask: public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxMask)
+    DECLARE_NO_COPY_CLASS(wxMask)
+
+public:
+  wxMask();
+
+  // Construct a mask from a bitmap and a colour indicating
+  // the transparent area
+  wxMask(const wxBitmap& bitmap, const wxColour& colour);
+
+  // Construct a mask from a bitmap and a palette index indicating
+  // the transparent area
+  wxMask(const wxBitmap& bitmap, int paletteIndex);
+
+  // Construct a mask from a mono bitmap (copies the bitmap).
+  wxMask(const wxBitmap& bitmap);
+
+  ~wxMask();
+
+  bool Create(const wxBitmap& bitmap, const wxColour& colour);
+  bool Create(const wxBitmap& bitmap, int paletteIndex);
+  bool Create(const wxBitmap& bitmap);
+
+  // Implementation
+  bool PointMasked(int x, int y);
+  inline WXHBITMAP GetMaskBitmap() const { return m_maskBitmap; }
+  inline void SetMaskBitmap(WXHBITMAP bmp) { m_maskBitmap = bmp; }
+  int GetDepth() const { return m_depth ; }
+  void SetDepth( int depth ) { m_depth = depth ; }
+protected:
+  WXHBITMAP m_maskBitmap;
+  int m_depth ;
+};
+
+enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
+
+class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
+{
+    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+        
+    friend class WXDLLEXPORT wxBitmap;
+    friend class WXDLLEXPORT wxIcon;
+    friend class WXDLLEXPORT wxCursor;
+public:
+    wxBitmapRefData();
+    ~wxBitmapRefData();
+
+public:
+  int           m_width;
+  int           m_height;
+  int           m_depth;
+  bool          m_ok;
+  int           m_numColors;
+#if wxUSE_PALETTE
+  wxPalette     m_bitmapPalette;
+#endif // wxUSE_PALETTE
+  int           m_quality;
+
+  int            m_bitmapType ;
+  WXHMETAFILE    m_hPict ;
+  WXHBITMAP     m_hBitmap;
+  WXHICON       m_hIcon ;
+  wxMask *      m_bitmapMask; // Optional mask
+  bool          m_hasAlpha;
+};
+
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
+
+class WXDLLEXPORT wxBitmapHandler: public wxBitmapHandlerBase
+{
+  DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+public:
+  wxBitmapHandler() : m_name(), m_extension(), m_type(0) { }
+  virtual ~wxBitmapHandler();
+
+  virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+      int desiredWidth, int desiredHeight);
+  virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+
+  void SetName(const wxString& name) { m_name = name; }
+  void SetExtension(const wxString& ext) { m_extension = ext; }
+  void SetType(long type) { m_type = type; }
+  wxString GetName() const { return m_name; }
+  wxString GetExtension() const { return m_extension; }
+  long GetType() const { return m_type; }
+
+protected:
+  wxString  m_name;
+  wxString  m_extension;
+  long      m_type;
+};
+
+#define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
+
+class WXDLLEXPORT wxBitmap: public wxBitmapBase
+{
+  DECLARE_DYNAMIC_CLASS(wxBitmap)
+
+  friend class WXDLLEXPORT wxBitmapHandler;
+
+public:
+  wxBitmap(); // Platform-specific
+
+  // Copy constructors
+  wxBitmap(const wxBitmap& bitmap)
+      : wxBitmapBase()
+  { Ref(bitmap); }
+
+  // Initialize with raw data.
+  wxBitmap(const char bits[], int width, int height, int depth = 1);
+
+  // Initialize with XPM data
+  bool CreateFromXpm(const char **bits);
+  wxBitmap(const char **bits);
+  wxBitmap(char **bits);
+
+  // Load a file or resource
+  wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_PICT_RESOURCE);
+
+  // Constructor for generalised creation from data
+  wxBitmap(void *data, wxBitmapType type, int width, int height, int depth = 1);
+
+  // If depth is omitted, will create a bitmap compatible with the display
+  wxBitmap(int width, int height, int depth = -1);
+  
+  // Convert from wxImage:
+  wxBitmap(const wxImage& image, int depth = -1);
+  
+  ~wxBitmap();
+  
+  wxImage ConvertToImage() const;
+
+  // get the given part of bitmap
+  wxBitmap GetSubBitmap( const wxRect& rect ) const;
+
+  virtual bool Create(int width, int height, int depth = -1);
+  virtual bool Create(void *data, wxBitmapType type, int width, int height, int depth = 1);
+  virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
+  virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
+
+  // copies the contents and mask of the given (colour) icon to the bitmap
+  virtual bool CopyFromIcon(const wxIcon& icon);
+
+  bool Ok() const;
+  int GetWidth() const;
+  int GetHeight() const;
+  int GetDepth() const;
+  int GetQuality() const;
+  void SetWidth(int w);
+  void SetHeight(int h);
+  void SetDepth(int d);
+  void SetQuality(int q);
+  void SetOk(bool isOk);
+
+#if wxUSE_PALETTE
+   wxPalette* GetPalette() const;
+   void SetPalette(const wxPalette& palette);
+#endif // wxUSE_PALETTE
+
+  wxMask *GetMask() const;
+  void SetMask(wxMask *mask) ;
+
+  int GetBitmapType() const;
+  
+  inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
+  inline bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
+  inline bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
+
+  static void InitStandardHandlers();
+
+    // raw bitmap access support functions, for internal use only
+    void *GetRawData(wxPixelDataBase& data, int bpp);
+    void UngetRawData(wxPixelDataBase& data);
+
+    void UseAlpha();
+
+public:
+  WXHBITMAP GetHBITMAP() const;
+  inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
+  WXHMETAFILE GetPict(bool *created = NULL ) const;
+
+  void SetHBITMAP(WXHBITMAP bmp);
+  void SetHICON(WXHICON ico);
+  void SetPict( WXHMETAFILE pict ) ;
+
+  bool FreeResource(bool force = FALSE);
+};
+#endif
+  // _WX_BITMAP_H_

include/wx/mac/carbon/bmpbuttn.h

@@ -0,0 +1,57 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        bmpbuttn.h
+// Purpose:     wxBitmapButton class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BMPBUTTN_H_
+#define _WX_BMPBUTTN_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "bmpbuttn.h"
+#endif
+
+#include "wx/button.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+
+#define wxDEFAULT_BUTTON_MARGIN 4
+
+class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+{
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+
+public:
+    wxBitmapButton()
+        {
+            SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
+        }
+    
+    wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxButtonNameStr)
+        {
+            Create(parent, id, bitmap, pos, size, style, validator, name);
+        }
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxButtonNameStr);
+
+    virtual void SetBitmapLabel(const wxBitmap& bitmap);
+
+protected:
+    virtual wxSize DoGetBestSize() const;    
+};
+
+#endif
+    // _WX_BMPBUTTN_H_

include/wx/mac/carbon/brush.h

@@ -0,0 +1,82 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        brush.h
+// Purpose:     wxBrush class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BRUSH_H_
+#define _WX_BRUSH_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "brush.h"
+#endif
+
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/bitmap.h"
+
+class WXDLLEXPORT wxBrush;
+
+typedef enum 
+{
+  kwxMacBrushColour ,
+  kwxMacBrushTheme ,
+  kwxMacBrushThemeBackground
+} wxMacBrushKind ;
+
+// Brush
+class WXDLLEXPORT wxBrush: public wxGDIObject
+{
+  DECLARE_DYNAMIC_CLASS(wxBrush)
+
+public:
+  wxBrush();
+  wxBrush(short macThemeBrush ) ;
+  wxBrush(const wxColour& col, int style = wxSOLID);
+  wxBrush(const wxBitmap& stipple);
+  wxBrush(const wxBrush& brush)
+      : wxGDIObject()
+      { Ref(brush); }
+  ~wxBrush();
+
+  virtual void SetColour(const wxColour& col)  ;
+  virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+  virtual void SetStyle(int style)  ;
+  virtual void SetStipple(const wxBitmap& stipple)  ;
+  virtual void MacSetTheme(short macThemeBrush) ;
+  virtual void MacSetThemeBackground(unsigned long macThemeBackground ,  WXRECTPTR extent) ;
+
+  wxBrush& operator = (const wxBrush& brush)
+  { if (*this == brush) return (*this); Ref(brush); return *this; }
+  bool operator == (const wxBrush& brush)
+  { return m_refData == brush.m_refData; }
+  bool operator != (const wxBrush& brush)
+  { return m_refData != brush.m_refData; }
+
+  wxMacBrushKind MacGetBrushKind()  const ;
+
+  unsigned long MacGetThemeBackground(WXRECTPTR extent)  const ;
+  short MacGetTheme()  const ;
+  wxColour& GetColour() const ;
+  int GetStyle() const ;
+  wxBitmap *GetStipple() const ;
+
+  virtual bool Ok() const { return (m_refData != NULL) ; }
+
+// Implementation
+
+  // Useful helper: create the brush resource
+  bool RealizeResource();
+
+  // When setting properties, we must make sure we're not changing
+  // another object
+  void Unshare();
+};
+
+#endif
+    // _WX_BRUSH_H_

include/wx/mac/carbon/button.h

@@ -0,0 +1,55 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        button.h
+// Purpose:     wxButton class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BUTTON_H_
+#define _WX_BUTTON_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "button.h"
+#endif
+
+#include "wx/control.h"
+#include "wx/gdicmn.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+
+// Pushbutton
+class WXDLLEXPORT wxButton: public wxButtonBase
+{
+  DECLARE_DYNAMIC_CLASS(wxButton)
+ public:
+  inline wxButton() {}
+  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr)
+  {
+      Create(parent, id, label, pos, size, style, validator, name);
+  }
+
+  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize, long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr);
+
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    static wxSize GetDefaultSize();
+
+  virtual void SetDefault();
+  virtual void Command(wxCommandEvent& event);
+protected:
+    virtual wxSize DoGetBestSize() const ;
+};
+
+#endif
+    // _WX_BUTTON_H_

include/wx/mac/carbon/checkbox.h

@@ -0,0 +1,84 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        checkbox.h
+// Purpose:     wxCheckBox class
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CHECKBOX_H_
+#define _WX_CHECKBOX_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "checkbox.h"
+#endif
+
+// Checkbox item (single checkbox)
+class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
+{
+public:
+    wxCheckBox() { }
+    wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr);
+    virtual void SetValue(bool);
+    virtual bool GetValue() const;
+
+    void DoSet3StateValue(wxCheckBoxState val);
+    virtual wxCheckBoxState DoGet3StateValue() const;
+
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown );
+    virtual void Command(wxCommandEvent& event);
+
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)
+};
+
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
+{
+public:
+    int checkWidth;
+    int checkHeight;
+
+    wxBitmapCheckBox()
+        : checkWidth(-1), checkHeight(-1)
+        { }
+
+    wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr);
+    virtual void SetValue(bool);
+    virtual bool GetValue() const;
+    virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual void SetLabel(const wxBitmap *bitmap);
+    virtual void SetLabel( const wxString & WXUNUSED(name) ) {}
+
+    DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
+};
+#endif
+    // _WX_CHECKBOX_H_

include/wx/mac/carbon/checklst.h

@@ -0,0 +1,105 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        checklst.h
+// Purpose:     wxCheckListBox class - a listbox with checkable items
+//              Note: this is an optional class.
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id$
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_CHECKLST_H_
+#define _WX_CHECKLST_H_
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "checklst.h"
+#endif
+
+#if !defined(__MWERKS__) && !defined(__UNIX__)
+typedef   unsigned int  size_t;
+#endif
+
+class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
+{
+  DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+public:
+  // ctors
+    wxCheckListBox() { Init(); }
+    wxCheckListBox(wxWindow *parent,
+                   wxWindowID id,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   int nStrings = 0,
+                   const wxString *choices = NULL,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxListBoxNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, nStrings, choices, style, validator, name);
+    }
+    wxCheckListBox(wxWindow *parent,
+                   wxWindowID id,
+                   const wxPoint& pos,
+                   const wxSize& size,
+                   const wxArrayString& choices,
+                   long style = 0,
+                   const wxValidator& validator = wxDefaultValidator,
+                   const wxString& name = wxListBoxNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int nStrings = 0,
+                const wxString *choices = NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+
+  // items may be checked
+  bool  IsChecked(size_t uiIndex) const;
+  void  Check(size_t uiIndex, bool bCheck = TRUE);
+  void OnChar(wxKeyEvent& event) ;
+  void OnLeftClick(wxMouseEvent& event) ;
+
+    // metrics
+    wxInt32 m_checkBoxWidth;
+    wxInt32 m_checkBoxHeight;
+    wxInt32    m_TextBaseLineOffset;
+
+    // the array containing the checked status of the items
+    wxArrayInt m_checks;
+
+    // override all methods which add/delete items to update m_checks array as
+    // well
+    virtual void Delete(int n);
+protected:
+    virtual int DoAppend(const wxString& item);
+    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoClear();
+    // common part of all ctors
+    void Init();
+private:
+  DECLARE_EVENT_TABLE()
+};
+
+#endif
+    // _WX_CHECKLST_H_