This commit was manufactured by cvs2svn to create tag 'wxPy_2_5_1_1'.

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

.cvsignore

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

build/bakefiles/README

@@ -20,10 +20,7 @@ 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:
-   <?xml version="1.0" ?>
-   <bakefile-gen>
-     <disable-formats>msvc,msvc6prj</disable-formats>
-   </bakefile-gen>
+   <disable-formats>msvc,msvc6prj</disable-formats>
 
 Note: bakefile_gen creates file .bakefile_gen.state with dependencies
 information. This file can be safely deleted, but it contains valuable

build/bakefiles/formats/wx24dsp.empy

@@ -318,10 +318,6 @@ 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]"
 

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", , [-lz -lm])
+                AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm])
             fi
 
             if test "x$PNG_LINK" = "x" ; then
@@ -3377,10 +3377,6 @@ 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, const wxString& s = wxEmptyString);
+         double radius = 0.0, wxChar *s = NULL);
   ~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;
-  wxString   m_textString;
+  wxChar*    m_textString;
 
 };
 

contrib/src/ogl/divided.cpp

@@ -700,8 +700,9 @@ void wxDividedShapeControlPoint::OnEndDragLeft(double WXUNUSED(x), double y, int
         wxShapeRegion *region = (wxShapeRegion *)node->GetData();
         if (region->GetText())
         {
-        wxString s(region->GetText());
-        dividedObject->FormatText(dc, s.c_str(), i);
+        wxChar *s = copystring(region->GetText());
+        dividedObject->FormatText(dc, s, i);
+        delete[] s;
         }
         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, const wxString& s) : wxDrawOp(theOp)
+         double theRadius, wxChar *s) : wxDrawOp(theOp)
 {
   m_x1 = theX1;
   m_y1 = theY1;
@@ -685,11 +685,13 @@ wxOpDraw::wxOpDraw(int theOp, double theX1, double theY1, double theX2, double t
   m_x3 = 0.0;
   m_y3 = 0.0;
   m_radius = theRadius;
-  m_textString = s;
+  if (s) m_textString = copystring(s);
+  else m_textString = NULL;
 }
 
 wxOpDraw::~wxOpDraw()
 {
+  if (m_textString) delete[] m_textString;
 }
 
 wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *WXUNUSED(newImage))
@@ -966,7 +968,8 @@ void wxOpDraw::ReadExpr(wxPseudoMetaFile *WXUNUSED(image), wxExpr *expr)
     {
       m_x1 = expr->Nth(1)->RealValue();
       m_y1 = expr->Nth(2)->RealValue();
-      m_textString = wxString(expr->Nth(3)->StringValue());
+      wxString str(expr->Nth(3)->StringValue());
+      m_textString = copystring(str);
       break;
     }
     case DRAWOP_DRAW_ARC:
@@ -2362,7 +2365,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 = text;
+    theOp->m_textString = copystring(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+1, (long)height+1); // +1 to allow for rounding errors
+                    (long)width, (long)height);
 
   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, len);
+    wxString cstr(buffer, wxConvUTF8);
 
     delete[] buffer;
     return cstr;

contrib/src/stc/ScintillaWX.cpp

@@ -58,6 +58,11 @@ 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,9 +2547,8 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
         if (len > 0)
         {
 #if wxUSE_UNICODE
-            wxMemoryBuffer buffer(len+1);
+            wxMemoryBuffer buffer(len);
             success = (file.Read(buffer.GetData(), len) == len);
-            ((char*)buffer.GetData())[len] = 0;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
@@ -2657,14 +2656,6 @@ 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));
 }
 
@@ -2692,7 +2683,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_COMMAND) &&
+    if ( (key <= WXK_START || key > WXK_NUMPAD_DIVIDE) &&
          !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
         return;

contrib/src/stc/stc.cpp.in

@@ -356,9 +356,8 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
         if (len > 0)
         {
 #if wxUSE_UNICODE
-            wxMemoryBuffer buffer(len+1);
+            wxMemoryBuffer buffer(len);
             success = (file.Read(buffer.GetData(), len) == len);
-            ((char*)buffer.GetData())[len] = 0;
             contents = wxString(buffer, *wxConvCurrent);
 #else
             wxString buffer;
@@ -466,14 +465,6 @@ 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));
 }
 
@@ -501,7 +492,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_COMMAND) &&
+    if ( (key <= WXK_START || key > WXK_NUMPAD_DIVIDE) &&
          !m_lastKeyDownConsumed && !skip) {
         m_swx->DoAddChar(key);
         return;

contrib/src/xrc/xh_bmpbt.cpp

@@ -32,7 +32,6 @@ 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"));
-        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("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(" }\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, const wxPoint& pos, const wxSize& size) :
-	wxScrolledWindow(parent, wxID_ANY, pos, size),
-	m_helpingHand(true),
-	m_rightBtnUndo(true),
+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),
 	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, const wxPoint& pos, const wxSize& size);
+	FortyCanvas(wxWindow* parent, int x, int y, int w, int h);
 	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,7 +15,6 @@
             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,9 +39,8 @@
 
 BEGIN_EVENT_TABLE(FortyFrame, wxFrame)
 	EVT_MENU(NEW_GAME, FortyFrame::NewGame)
-	EVT_MENU(wxID_EXIT, FortyFrame::Exit)
-	EVT_MENU(wxID_ABOUT, FortyFrame::About)
-	EVT_MENU(wxID_HELP_CONTENTS, FortyFrame::Help)
+	EVT_MENU(EXIT, FortyFrame::Exit)
+	EVT_MENU(ABOUT, FortyFrame::About)
 	EVT_MENU(UNDO, FortyFrame::Undo)
 	EVT_MENU(REDO, FortyFrame::Redo)
 	EVT_MENU(SCORES, FortyFrame::Scores)
@@ -74,30 +73,27 @@ 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"),
-    wxDefaultPosition,
-    size,
-    largecards
+                        -1, -1, size.x, size.y,largecards
 			);
 
  	// Show the frame
-	frame->Show(true);
+	frame->Show(TRUE);
 
         frame->GetCanvas()->ShowPlayerDialog();
 
-	return true;
+	return TRUE;
 }
 
 const wxColour& FortyApp::BackgroundColour()
@@ -131,11 +127,12 @@ const wxColour& FortyApp::TextColour()
 }
 
 // My frame constructor
-FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards):
-	wxFrame(frame, wxID_ANY, title, pos, size)
+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))
 {
 #ifdef __WXMAC__
-	wxApp::s_macAboutMenuItemId = wxID_ABOUT ;
+	// 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 ;
 #endif
 	// set the icon
 #ifdef __WXMSW__
@@ -150,7 +147,7 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
 	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(wxID_EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
+	gameMenu->Append(EXIT, _T("E&xit"), _T("Exits Forty Thieves"));
 
 	wxMenu* editMenu = new wxMenu;
 	editMenu->Append(UNDO, _T("&Undo"), _T("Undo the last move"));
@@ -160,25 +157,24 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
 	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(wxID_HELP_CONTENTS, _T("&Help Contents"), _T("Displays information about playing the game"));
-	helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About Forty Thieves"));
+	helpMenu->Append(ABOUT, _T("&About..."), _T("Displays information about the game"));
 
 	m_menuBar = new wxMenuBar;
 	m_menuBar->Append(gameMenu,    _T("&Game"));
@@ -191,12 +187,13 @@ FortyFrame::FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos
         if (largecards)
             Card::SetScale(1.3);
 
-	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 );
+	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);
 
 	CreateStatusBar();
 }
@@ -224,16 +221,20 @@ FortyFrame::NewGame(wxCommandEvent&)
 void
 FortyFrame::Exit(wxCommandEvent&)
 {
-	Close(true);
+#ifdef __WXGTK__
+	// wxGTK doesn't call OnClose() so we do it here
+//	if (OnClose())
+#endif
+	Close(TRUE);
 }
 
 void
-FortyFrame::Help(wxCommandEvent& event)
+FortyFrame::About(wxCommandEvent&)
 {
 #if wxUSE_HTML
     if (wxFileExists(wxT("about.htm")))
     {
-        FortyAboutDialog dialog(this, wxID_ANY, wxT("Forty Thieves Instructions"));
+        FortyAboutDialog dialog(this, -1, wxT("About Forty Thieves"));
         if (dialog.ShowModal() == wxID_OK)
         {
         }
@@ -241,24 +242,20 @@ FortyFrame::Help(wxCommandEvent& event)
     else
 #endif
     {
-        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("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|wxICON_INFORMATION, this
+            wxOK, this
             );
+    }
 }
 
-
 void
 FortyFrame::Undo(wxCommandEvent&)
 {
@@ -382,12 +379,13 @@ 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, const wxPoint& pos, const wxSize& size, bool largecards);
+        FortyFrame(wxFrame* frame, const wxString& title, int x, int y, int w, int h,bool largecards);
 	virtual ~FortyFrame();
 
 	void OnCloseWindow(wxCloseEvent& event);
@@ -43,7 +43,6 @@ 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);
@@ -56,10 +55,10 @@ public:
 	DECLARE_EVENT_TABLE()
 
 private:
-	enum MenuCommands { NEW_GAME = 10, SCORES,
+	enum MenuCommands { NEW_GAME = 10, SCORES, EXIT,
 						UNDO, REDO,
-                        RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS
-					};
+                                                RIGHT_BUTTON_UNDO, HELPING_HAND, LARGE_CARDS,
+						ABOUT };
 
 	wxMenuBar*		m_menuBar;
 	FortyCanvas*	m_canvas;

demos/forty/forty.r

@@ -1,27 +0,0 @@
-#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,12 +44,15 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 							wxWindow* parent,
 							ScoreFile* file
 							) :
-	wxDialog(parent, wxID_ANY, _T("Player Selection"),
-			wxDefaultPosition, wxDefaultSize,
+	wxDialog(parent, -1, _T("Player Selection"),
+			wxDefaultPosition, wxSize(320, 200),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
 {
-	wxStaticText* msg = new wxStaticText(this, wxID_ANY, _T("Please select a name or type a new one:"));
+	// enable constraints
+	SetAutoLayout (TRUE);
+
+	wxStaticText* msg = new wxStaticText(this, -1, _T("Please select a name or type a new one:"));
 
 	wxListBox* list = new wxListBox(
 						this, ID_LISTBOX,
@@ -65,24 +68,63 @@ PlayerSelectionDialog::PlayerSelectionDialog(
 		list->Append(players[i]);
 	}
 
-	m_textField = new wxTextCtrl(this, wxID_ANY, _T(""), wxDefaultPosition, wxDefaultSize, 0);
+	m_textField = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxDefaultSize, 0);
 
 	m_OK = new wxButton(this, wxID_OK, _T("OK"));
 	m_cancel = new wxButton(this, wxID_CANCEL, _T("Cancel"));
 
-  wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
-  button_sizer->Add( m_OK, 0, wxALL, 10 );
-  button_sizer->Add( m_cancel, 0, wxALL, 10 );
+	wxLayoutConstraints* 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 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);
 
-  SetSizer( topsizer );
+	// 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);
 
-  topsizer->SetSizeHints( this );
+	// 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();
     
     CentreOnParent();
 }
@@ -100,7 +142,7 @@ const wxString& PlayerSelectionDialog::GetPlayersName()
 {
 /*
 	m_player = "";
-	Show(true);
+	Show(TRUE);
 */
 	return m_player;
 }

demos/forty/scoredg.cpp

@@ -30,15 +30,10 @@
 #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, const wxPoint& pos, wxSize& size);
+	ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile);
 	virtual ~ScoreCanvas();
 
 	void OnDraw(wxDC& dc);
@@ -48,17 +43,17 @@ private:
 	wxString	m_text;
 };
 
-ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile, const wxPoint& pos, wxSize& size) :
-	wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
+
+ScoreCanvas::ScoreCanvas(wxWindow* parent, ScoreFile* scoreFile) :
+	wxScrolledWindow(parent)
 {
-    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;
@@ -129,72 +124,45 @@ 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, wxID_ANY, _("Scores"),
-			wxDefaultPosition, wxSize(400, 300),
+ScoreDialog::ScoreDialog(
+							wxWindow* parent,
+							ScoreFile* file
+							) :
+	wxDialog(parent, -1, _("Scores"),
+			wxDefaultPosition, wxSize(310, 200),
 			wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE),
 	m_scoreFile(file)
 {
-    // create grid with players
-    wxArrayString players;
-	file->GetPlayerList(players);
-    
-    wxSize sz = wxSize(400, 300);
+	// enable constraints
+	SetAutoLayout (TRUE);
 
-#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;
+	ScoreCanvas* list = new ScoreCanvas(this, m_scoreFile);
+	m_OK = new wxButton(this, wxID_OK, _("OK"));
 
-		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
+	wxLayoutConstraints* 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 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 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);
 
-    GetSizer()->Fit(this);
-    GetSizer()->SetSizeHints(this);
-    
-    CentreOnParent();
+	Layout();
 }
 
 ScoreDialog::~ScoreDialog()
@@ -203,7 +171,7 @@ ScoreDialog::~ScoreDialog()
 
 void ScoreDialog::Display()
 {
-	Show(true);
+	Show(TRUE);
 }
 
 void ScoreDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

demos/poem/wxpoemCE.vcp

@@ -4,7 +4,6 @@
 
 # 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,
@@ -23,10 +22,6 @@ 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
@@ -50,23 +45,22 @@ 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 ""
-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
-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
+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
+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
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE ARM) Debug"
 
@@ -83,24 +77,22 @@ RSC=rc.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 ""
-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
-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
+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
+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
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Release"
 
@@ -117,14 +109,13 @@ RSC=rc.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 /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
+# 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
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -132,8 +123,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# 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
+# 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
 
 !ELSEIF  "$(CFG)" == "wxPoemCE - Win32 (WCE x86) Debug"
 
@@ -157,7 +148,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 "../../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
+# 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
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -165,146 +156,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LINK32=link.exe
-# 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
+# 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
 
 !ENDIF 
 
@@ -314,10 +168,6 @@ 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"
@@ -385,66 +235,6 @@ 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
@@ -458,34 +248,11 @@ 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 x11
+	make univ
 	purge [...]
 	delete [...]*.obj;
 
@@ -78,57 +78,57 @@ gtk : [.include.wx]setup.h
 	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1)
 	set default [--]
 
-x11 : [.include.wx]setup.h
+univ : [.include.wx]setup.h
 	set default [.src.generic]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
 	set default [-.common]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
 	set default [-.html]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
 	set default [-.unix]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
-	set default [-.x11]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
+	set default [-.gtk]
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
 	set default [-.univ]
-	$(MMS)$(MMSQUALIFIERS)/macro=(__WXX11__=1,__WXUNIVERSAL__=1)
+	$(MMS)$(MMSQUALIFIERS)/macro=(__WXGTK__=1,__WXUNIVERSAL__=1)
 	set default [--.contrib.src.deprecated]
-#	$(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)
+	$(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)
 	set default [--]
 
 motif : [.include.wx]setup.h

docs/changes.txt

@@ -39,12 +39,6 @@ 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
@@ -98,17 +92,6 @@ 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,7 +96,6 @@ 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,9 +7,6 @@ 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,12 +684,13 @@ 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.
-Not available for wxPostScriptDC or wxMetafileDC.
+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.
 
 \pythonnote{For wxPython the wxColour value is returned and is not
 required as a parameter.}
@@ -697,20 +698,17 @@ 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}
 
-\constfunc{void}{GetSize}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
+\func{void}{GetSize}{\param{wxCoord *}{width}, \param{wxCoord *}{height}}
 
-\constfunc{wxSize}{GetSize}{\void}
+For a PostScript device context, this gets the maximum size of graphics
+drawn so far on the device context.
 
-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
+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
 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:
@@ -739,13 +737,6 @@ 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}
 
@@ -1047,10 +1038,12 @@ 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.
 
-The coordinate origin is always at the top left of the screen/printer.
+Note that the coordinate origin should ideally be selectable, but for
+now is always at the top left of the screen/printer.
 
-Drawing to a Windows printer device context uses the current mapping mode,
-but mapping mode is currently ignored for PostScript output.
+Drawing to a Windows printer device context under UNIX
+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,13 +28,12 @@ No base class
 
 Virtual destructor for any base class.
 
-\membersection{wxHelpProvider::AddHelp}\label{wxhelpprovideraddhelp}
+\membersection{wxHelpProvider::Set}\label{wxhelpproviderset}
 
-\func{void}{AddHelp}{\param{wxWindowBase* }{window}, \param{const wxString\& }{text}}
+\func{wxHelpProvider*}{Set}{\param{wxHelpProvider* }{helpProvider}}
 
-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.
+Get/set the current, application-wide help provider. Returns
+the previous one.
 
 \membersection{wxHelpProvider::Get}\label{wxhelpproviderget}
 
@@ -51,6 +50,24 @@ 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.
@@ -65,20 +82,3 @@ 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,7 +130,6 @@ 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,6 +59,12 @@ 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/window.tex

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

docs/toback24.txt

@@ -278,34 +278,6 @@ 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/dataobj.h

@@ -335,35 +335,21 @@ 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/generic/splitter.h

@@ -129,11 +129,6 @@ 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,7 +68,6 @@ public:
 
 protected:
     virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
 
     void Init();
 

include/wx/gtk/menu.h

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

include/wx/gtk/msgdlg.h

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

include/wx/gtk/notebook.h

@@ -106,9 +106,6 @@ 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,7 +68,6 @@ public:
 
 protected:
     virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
 
     void Init();
 

include/wx/gtk1/menu.h

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

include/wx/gtk1/msgdlg.h

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

include/wx/gtk1/notebook.h

@@ -106,9 +106,6 @@ 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,11 +172,6 @@ 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;}
 
@@ -433,10 +428,6 @@ 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;
@@ -466,10 +457,7 @@ 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,36 +371,29 @@ public:
     // -----------
 
         // call Init() if you use this ctor
-    wxLocale() { DoCommonInit(); }
-
+    wxLocale();
         // 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)
-        {
-            DoCommonInit();
+        { Init(language, flags); }
 
-            Init(language, flags);
-        }
-
-        // the same as a function (returns true on success)
+        // 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);
 
@@ -423,7 +416,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
@@ -516,9 +509,6 @@ 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/bmpbuttn.h

@@ -56,9 +56,6 @@ public:
   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 );
 */
-
-protected:
-    virtual wxSize DoGetBestSize() const;    
 };
 
 #endif

include/wx/menu.h

@@ -330,11 +330,6 @@ public:
         Insert(0u, itemid, text, help, isCheckable);
     }
 
-    static void LockAccels(bool locked)
-    {
-        ms_locked = locked;
-    }
-    
 protected:
     // virtuals to override in derived classes
     // ---------------------------------------
@@ -367,8 +362,6 @@ protected:
 
     wxEvtHandler  *m_eventHandler;      // a pluggable in event handler
 
-    static bool      ms_locked;
-    
     DECLARE_NO_COPY_CLASS(wxMenuBase)
 };
 

include/wx/motif/menuitem.h

@@ -47,6 +47,8 @@ public:
     virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
     virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
     
+    void DeleteSubMenu();
+    
     // implementation from now on
     void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu);
     void DestroyItem(bool full);

include/wx/msw/bmpbuttn.h

@@ -54,9 +54,6 @@ public:
     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 );
 
-protected:
-    virtual wxSize DoGetBestSize() const;
-    
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
 };

include/wx/msw/taskbar.h

@@ -3,7 +3,7 @@
 // Purpose:     Defines wxTaskBarIcon class for manipulating icons on the
 //              Windows task bar.
 // Author:      Julian Smart
-// Modified by: Vaclav Slavik
+// Modified by:
 // Created:     24/3/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
@@ -17,20 +17,24 @@
 #pragma interface "taskbar.h"
 #endif
 
+#include "wx/list.h"
 #include "wx/icon.h"
 
-// private helper class:
-class WXDLLIMPEXP_ADV wxTaskBarIconWindow;
+class WXDLLIMPEXP_ADV wxTaskBarIcon;
+
+WX_DECLARE_LIST_WITH_DECL(wxTaskBarIcon, wxTaskBarIconList,
+                          class WXDLLIMPEXP_ADV);
 
 class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
 {
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
 public:
-    wxTaskBarIcon();
-    virtual ~wxTaskBarIcon();
+    wxTaskBarIcon(void);
+    virtual ~wxTaskBarIcon(void);
 
 // Accessors
-    inline bool IsOk() const { return true; }
+    inline WXHWND GetHWND() const { return m_hWnd; }
+    inline bool IsOk() const { return (m_hWnd != 0) ; }
     inline bool IsIconInstalled() const { return m_iconAdded; }
 
 // Operations
@@ -52,17 +56,21 @@ public:
 #endif
 
 // Implementation
-protected:
-    friend class wxTaskBarIconWindow;
-    long WindowProc(unsigned int msg, unsigned int wParam, long lParam);
-    void RegisterWindowMessages();
+    static wxTaskBarIcon* FindObjectForHWND(WXHWND hWnd);
+    static void AddObject(wxTaskBarIcon* obj);
+    static void RemoveObject(wxTaskBarIcon* obj);
+    static bool RegisterWindowClass();
+    static WXHWND CreateTaskBarWindow();
+    long WindowProc( WXHWND hWnd, unsigned int msg, unsigned int wParam, long lParam );
 
 // Data members
 protected:
-    wxTaskBarIconWindow *m_win;
-    bool                 m_iconAdded;
-    wxIcon               m_icon;
-    wxString             m_strTooltip;
+    WXHWND          m_hWnd;
+    bool            m_iconAdded;
+    wxIcon          m_icon;
+    wxString        m_strTooltip;
+
+    static wxTaskBarIconList sm_taskBarIcons;
 
 #if WXWIN_COMPATIBILITY_2_4
     // non-virtual default event handlers to forward events to the virtuals
@@ -84,3 +92,8 @@ inline bool wxTaskBarIcon::IsOK() const { return IsOk(); }
 
 #endif
     // _TASKBAR_H_
+
+
+
+
+

include/wx/msw/window.h

@@ -28,6 +28,13 @@
 // a better solution should be found later...
 #define wxUSE_MOUSEEVENT_HACK 0
 
+#include "wx/hash.h"
+
+// pseudo-template HWND <-> wxWindow hash table
+WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable);
+
+extern wxWinHashTable *wxWinHandleHash;
+
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
@@ -481,7 +488,7 @@ inline void wxWindowMSW::SetTransparent(bool WXUNUSED(t)) { }
 // ---------------------------------------------------------------------------
 
 // kbd code translation
-WXDLLEXPORT int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam = 0);
+WXDLLEXPORT int wxCharCodeMSWToWX(int keySym);
 WXDLLEXPORT int wxCharCodeWXToMSW(int id, bool *IsVirtual);
 
 // window creation helper class: before creating a new HWND, instantiate an
@@ -494,18 +501,5 @@ public:
     ~wxWindowCreationHook();
 };
 
-// ----------------------------------------------------------------------------
-// global objects
-// ----------------------------------------------------------------------------
-
-// notice that this hash must be defined after wxWindow declaration as it
-// needs to "see" its dtor and not just forward declaration
-#include "wx/hash.h"
-
-// pseudo-template HWND <-> wxWindow hash table
-WX_DECLARE_HASH(wxWindow, wxWindowList, wxWinHashTable);
-
-extern wxWinHashTable *wxWinHandleHash;
-
 #endif
     // _WX_WINDOW_H_

include/wx/msw/wrapcctl.h

@@ -43,17 +43,5 @@
 // define things which might be missing from our commctrl.h
 #include "wx/msw/missing.h"
 
-// Set Unicode format for a common control
-inline void wxSetCCUnicodeFormat(HWND hwnd)
-{
-    SendMessage(hwnd, CCM_SETUNICODEFORMAT,
-#if wxUSE_UNICODE
-                TRUE
-#else
-                FALSE
-#endif
-                , 0);
-}
-
 #endif // _WX_MSW_WRAPCCTL_H_
 

include/wx/os2/private.h

@@ -34,6 +34,9 @@
  typedef SPBCDATA *PSPBCDATA;
 #endif
 
+#undef WS_VISIBLE
+#define WS_VISIBLE 0
+
 #include "wx/fontenc.h"
 
 class WXDLLEXPORT wxFont;

include/wx/textctrl.h

@@ -33,7 +33,7 @@
 // streambuf. !! Also, can't use streambuf if making or using a DLL :-(
 
 #if (defined(__BORLANDC__)) || defined(__MWERKS__) || \
-    (defined(__WINDOWS__) && (defined(WXUSINGDLL) || defined(WXMAKINGDLL)))
+    defined(WXUSINGDLL) || defined(WXMAKINGDLL)
     #define NO_TEXT_WINDOW_STREAM
 #endif
 

include/wx/vms_x_fix.h

@@ -2,7 +2,7 @@
  *                                                                         *
  * Author : Jouk Jansen (joukj@hrem.stm.tudelft.nl)                        *
  *                                                                         *
- * Last revision : 19 January 2004                                         *
+ * Last revision : 28 March 2003                                           *
  *                                                                         *
  * Repair definitions of Runtime library functions when compiling with     *
  * /name=(as_is) on OpenVMS                                                *
@@ -39,7 +39,6 @@
 #define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
 #define XCheckIfEvent XCHECKIFEVENT
 #define XCheckMaskEvent XCHECKMASKEVENT
-#define XCheckTypedEvent XCHECKTYPEDEVENT
 #define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT
 #define XCheckWindowEvent XCHECKWINDOWEVENT
 #define XClearArea XCLEARAREA
@@ -58,7 +57,6 @@
 #define XCreateFontCursor XCREATEFONTCURSOR
 #define XCreateFontSet XCREATEFONTSET
 #define XCreateGC XCREATEGC
-#define XCreateGlyphCursor XCREATEGLYPHCURSOR
 #define XCreateIC XCREATEIC
 #define XCreateImage XCREATEIMAGE
 #define XCreatePixmap XCREATEPIXMAP
@@ -108,9 +106,7 @@
 #define XEnableAccessControl XENABLEACCESSCONTROL
 #define XEqualRegion XEQUALREGION
 #define XEventsQueued XEVENTSQUEUED
-#define XExtendedMaxRequestSize XEXTENDEDMAXREQUESTSIZE
 #define XExtentsOfFontSet XEXTENTSOFFONTSET
-#define XFetchBuffer XFETCHBUFFER
 #define XFetchName XFETCHNAME
 #define XFillArc XFILLARC
 #define XFillArcs XFILLARCS
@@ -136,7 +132,6 @@
 #define XFreeModifiermap XFREEMODIFIERMAP
 #define XFreePixmap XFREEPIXMAP
 #define XFreeStringList XFREESTRINGLIST
-#define XGContextFromGC XGCONTEXTFROMGC
 #define XGetAtomName XGETATOMNAME
 #define XGetCommand XGETCOMMAND
 #define XGetDefault XGETDEFAULT
@@ -160,7 +155,6 @@
 #define XGetRGBColormaps XGETRGBCOLORMAPS
 #define XGetScreenSaver XGETSCREENSAVER
 #define XGetSelectionOwner XGETSELECTIONOWNER
-#define XGetStandardColormap XGETSTANDARDCOLORMAP
 #define XGetSubImage XGETSUBIMAGE
 #define XGetTextProperty XGETTEXTPROPERTY
 #define XGetVisualInfo XGETVISUALINFO
@@ -179,13 +173,11 @@
 #define XIfEvent XIFEVENT
 #define XInstallColormap XINSTALLCOLORMAP
 #define XInternAtom XINTERNATOM
-#define XInternAtoms XINTERNATOMS
 #define XIntersectRegion XINTERSECTREGION
 #define XKeycodeToKeysym XKEYCODETOKEYSYM
 #define XKeysymToKeycode XKEYSYMTOKEYCODE
 #define XKeysymToString XKEYSYMTOSTRING
 #define XKillClient XKILLCLIENT
-#define XListDepths XLISTDEPTHS
 #define XListFonts XLISTFONTS
 #define XListFontsWithInfo XLISTFONTSWITHINFO
 #define XListHosts XLISTHOSTS
@@ -208,7 +200,6 @@
 #define XMoveResizeWindow XMOVERESIZEWINDOW
 #define XMoveWindow XMOVEWINDOW
 #define XNextEvent XNEXTEVENT
-#define XNoOp XNOOP
 #define XOffsetRegion XOFFSETREGION
 #define XOpenDevice XOPENDEVICE
 #define XOpenDisplay XOPENDISPLAY
@@ -222,8 +213,6 @@
 #define XPolygonRegion XPOLYGONREGION
 #define XPutBackEvent XPUTBACKEVENT
 #define XPutImage XPUTIMAGE
-#define XQueryBestCursor XQUERYBESTCURSOR
-#define XQueryBestStipple XQUERYBESTSTIPPLE
 #define XQueryColor XQUERYCOLOR
 #define XQueryColors XQUERYCOLORS
 #define XQueryDeviceState XQUERYDEVICESTATE
@@ -289,7 +278,6 @@
 #define XSetTSOrigin XSETTSORIGIN
 #define XSetTile XSETTILE
 #define XSetTransientForHint XSETTRANSIENTFORHINT
-#define XSetWMClientMachine XSETWMCLIENTMACHINE
 #define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS
 #define XSetWMHints XSETWMHINTS
 #define XSetWMIconName XSETWMICONNAME
@@ -297,27 +285,21 @@
 #define XSetWMNormalHints XSETWMNORMALHINTS
 #define XSetWMProperties XSETWMPROPERTIES
 #define XSetWMProtocols XSETWMPROTOCOLS
-#define XSetWMSizeHints XSETWMSIZEHINTS
 #define XSetWindowBackground XSETWINDOWBACKGROUND
 #define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
 #define XSetWindowBorder XSETWINDOWBORDER
-#define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP
 #define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
 #define XSetWindowColormap XSETWINDOWCOLORMAP
 #define XShapeCombineMask XSHAPECOMBINEMASK
 #define XShapeCombineRectangles XSHAPECOMBINERECTANGLES
 #define XShapeGetRectangles XSHAPEGETRECTANGLES
-#define XShapeQueryExtension XSHAPEQUERYEXTENSION
 #define XShmAttach XSHMATTACH
 #define XShmCreateImage XSHMCREATEIMAGE
 #define XShmCreatePixmap XSHMCREATEPIXMAP
 #define XShmDetach XSHMDETACH
-#define XShmGetEventBase XSHMGETEVENTBASE
 #define XShmPutImage XSHMPUTIMAGE
-#define XShmQueryExtension XSHMQUERYEXTENSION
 #define XShmQueryVersion XSHMQUERYVERSION
 #define XShrinkRegion XSHRINKREGION
-#define XStoreBuffer XSTOREBUFFER
 #define XStoreBytes XSTOREBYTES
 #define XStoreColor XSTORECOLOR
 #define XStoreColors XSTORECOLORS
@@ -606,7 +588,6 @@
 #define XrmPutStringResource XRMPUTSTRINGRESOURCE
 #define XrmQPutStringResource XRMQPUTSTRINGRESOURCE
 #define XrmQuarkToString XRMQUARKTOSTRING
-#define XrmSetDatabase XRMSETDATABASE
 #define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST
 #define XrmStringToQuark XRMSTRINGTOQUARK
 #define XrmStringToQuark XRMSTRINGTOQUARK
@@ -648,7 +629,6 @@
 #define XtDestroyWidget XTDESTROYWIDGET
 #define XtDisownSelection XTDISOWNSELECTION
 #define XtDispatchEvent XTDISPATCHEVENT
-#define XtDisplay XTDISPLAY
 #define XtDisplayOfObject XTDISPLAYOFOBJECT
 #define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING
 #define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT
@@ -673,7 +653,6 @@
 #define XtInsertEventHandler XTINSERTEVENTHANDLER
 #define XtIsManaged XTISMANAGED
 #define XtIsObject XTISOBJECT
-#define XtIsRealized XTISREALIZED
 #define XtIsSensitive XTISSENSITIVE
 #define XtIsSubclass XTISSUBCLASS
 #define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED
@@ -690,7 +669,6 @@
 #define XtOpenDisplay XTOPENDISPLAY
 #define XtOverrideTranslations XTOVERRIDETRANSLATIONS
 #define XtOwnSelection XTOWNSELECTION
-#define XtParent XTPARENT
 #define XtParseTranslationTable XTPARSETRANSLATIONTABLE
 #define XtPopdown XTPOPDOWN
 #define XtPopup XTPOPUP
@@ -709,7 +687,6 @@
 #define XtRemoveWorkProc XTREMOVEWORKPROC
 #define XtResizeWidget XTRESIZEWIDGET
 #define XtResolvePathname XTRESOLVEPATHNAME
-#define XtScreen XTSCREEN
 #define XtSetKeyboardFocus XTSETKEYBOARDFOCUS
 #define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED
 #define XtSetSensitive XTSETSENSITIVE
@@ -734,7 +711,6 @@
 #define XtVaSetValues XTVASETVALUES
 #define XtWarning XTWARNING
 #define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT
-#define XtWindow XTWINDOW
 #define XtWindowOfObject XTWINDOWOFOBJECT
 #define XtWindowToWidget XTWINDOWTOWIDGET
 #define XwcDrawString XWCDRAWSTRING
@@ -743,12 +719,8 @@
 #define XwcTextExtents XWCTEXTEXTENTS
 #define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY
 #define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST
-#define _XAllocTemp _XALLOCTEMP
-#define _XDeqAsyncHandler _XDEQASYNCHANDLER
 #define _XEatData _XEATDATA
 #define _XFlush _XFLUSH
-#define _XFreeTemp _XFREETEMP
-#define _XGetAsyncReply _XGETASYNCREPLY 
 #define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS
 #define _XRead _XREAD
 #define _XRegisterFilterByType _XREGISTERFILTERBYTYPE 
@@ -798,64 +770,14 @@
 #define _XtInheritTranslations _XTINHERITTRANSLATIONS
 #define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS
 #define compositeWidgetClass COMPOSITEWIDGETCLASS
-#define exe$getspi EXE$GETSPI
-#define lbr$close LBR$CLOSE
-#define lbr$get_header LBR$GET_HEADER
-#define lbr$get_index LBR$GET_INDEX
-#define lbr$get_record LBR$GET_RECORD
-#define lbr$ini_control LBR$INI_CONTROL
-#define lbr$lookup_key LBR$LOOKUP_KEY
-#define lbr$open LBR$OPEN
-#define lib$add_times LIB$ADD_TIMES
-#define lib$addx LIB$ADDX
-#define lib$create_dir LIB$CREATE_DIR
-#define lib$create_vm_zone LIB$CREATE_VM_ZONE
-#define lib$cvt_from_internal_time LIB$CVT_FROM_INTERNAL_TIME
-#define lib$cvt_htb LIB$CVT_HTB
-#define lib$cvt_vectim LIB$CVT_VECTIM
-#define lib$day LIB$DAY
-#define lib$day_of_week LIB$DAY_OF_WEEK
-#define lib$delete_symbol LIB$DELETE_SYMBOL
-#define lib$delete_vm_zone LIB$DELETE_VM_ZONE
-#define lib$disable_ctrl LIB$DISABLE_CTRL
 #define lib$ediv LIB$EDIV
-#define lib$emul LIB$EMUL
-#define lib$enable_ctrl LIB$ENABLE_CTRL
-#define lib$find_vm_zone LIB$FIND_VM_ZONE
-#define lib$format_date_time LIB$FORMAT_DATE_TIME
-#define lib$free_timer LIB$FREE_TIMER
-#define lib$free_vm LIB$FREE_VM
-#define lib$get_ef LIB$GET_EF
-#define lib$get_foreign LIB$GET_FOREIGN
-#define lib$get_users_language LIB$GET_USERS_LANGUAGE
-#define lib$get_vm LIB$GET_VM
-#define lib$get_symbol LIB$GET_SYMBOL
-#define lib$getdvi LIB$GETDVI
-#define lib$init_date_time_context LIB$INIT_DATE_TIME_CONTEXT
-#define lib$init_timer LIB$INIT_TIMER
 #define lib$find_file LIB$FIND_FILE
 #define lib$find_file_end LIB$FIND_FILE_END
-#define lib$find_image_symbol LIB$FIND_IMAGE_SYMBOL
-#define lib$mult_delta_time LIB$MULT_DELTA_TIME
-#define lib$rename_file LIB$RENAME_FILE
-#define lib$reset_vm_zone LIB$RESET_VM_ZONE
 #define lib$set_symbol LIB$SET_SYMBOL
 #define lib$sfree1_dd LIB$SFREE1_DD
-#define lib$show_vm LIB$SHOW_VM
-#define lib$show_vm_zone LIB$SHOW_VM_ZONE
 #define lib$spawn LIB$SPAWN
-#define lib$stat_timer LIB$STAT_TIMER
 #define lib$subx LIB$SUBX
-#define lib$sub_times LIB$SUB_TIMES
 #define lib$wait LIB$WAIT
-#define mail$send_add_address MAIL$SEND_ADD_ADDRESS
-#define mail$send_add_attribute MAIL$SEND_ADD_ATTRIBUTE
-#define mail$send_add_bodypart MAIL$SEND_ADD_BODYPART
-#define mail$send_begin MAIL$SEND_BEGIN
-#define mail$send_end MAIL$SEND_END
-#define mail$send_message MAIL$SEND_MESSAGE
-#define ncs$convert NCS$CONVERT
-#define ncs$get_cf NCS$GET_CF
 #define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS
 #define pthread_attr_create PTHREAD_ATTR_CREATE
 #define pthread_attr_delete PTHREAD_ATTR_DELETE
@@ -952,82 +874,19 @@
 #define shmctl SHMCTL
 #define shmdt SHMDT
 #define shmget SHMGET
-#define sys$add_ident SYS$ADD_IDENT
-#define sys$asctoid SYS$ASCTOID
 #define sys$assign SYS$ASSIGN
 #define sys$bintim SYS$BINTIM
-#define sys$cancel SYS$CANCEL
-#define sys$cantim SYS$CANTIM
-#define sys$check_access SYS$CHECK_ACCESS
-#define sys$close SYS$CLOSE
-#define sys$connect SYS$CONNECT
-#define sys$create SYS$CREATE
-#define sys$create_user_profile SYS$CREATE_USER_PROFILE
 #define sys$crembx SYS$CREMBX
-#define sys$creprc SYS$CREPRC
-#define sys$crmpsc SYS$CRMPSC
 #define sys$dassgn SYS$DASSGN
-#define sys$dclast SYS$DCLAST
 #define sys$dclexh SYS$DCLEXH
-#define sys$delprc SYS$DELPRC
-#define sys$deq SYS$DEQ
-#define sys$dgblsc SYS$DGBLSC
-#define sys$display SYS$DISPLAY
-#define sys$enq SYS$ENQ
-#define sys$enqw SYS$ENQW
-#define sys$erase SYS$ERASE
-#define sys$fao SYS$FAO
-#define sys$faol SYS$FAOL
-#define sys$find_held SYS$FIND_HELD
-#define sys$finish_rdb SYS$FINISH_RDB
-#define sys$flush SYS$FLUSH
-#define sys$forcex SYS$FORCEX
-#define sys$get SYS$GET
-#define sys$get_security SYS$GET_SECURITY
 #define sys$getdviw SYS$GETDVIW
-#define sys$getjpi SYS$GETJPI
-#define sys$getjpiw SYS$GETJPIW
-#define sys$getlkiw SYS$GETLKIW
-#define sys$getmsg SYS$GETMSG
-#define sys$getsyi SYS$GETSYI
 #define sys$getsyiw SYS$GETSYIW
 #define sys$gettim SYS$GETTIM
-#define sys$getuai SYS$GETUAI
-#define sys$grantid SYS$GRANTID
-#define sys$hash_password SYS$HASH_PASSWORD
-#define sys$hiber SYS$HIBER
-#define sys$mgblsc SYS$MGBLSC
-#define sys$numtim SYS$NUMTIM
-#define sys$open SYS$OPEN
-#define sys$parse SYS$PARSE
-#define sys$parse_acl SYS$PARSE_ACL
-#define sys$parse_acl SYS$PARSE_ACL
-#define sys$persona_assume SYS$PERSONA_ASSUME
-#define sys$persona_create SYS$PERSONA_CREATE
-#define sys$persona_delete SYS$PERSONA_DELETE
-#define sys$process_scan SYS$PROCESS_SCAN
-#define sys$put SYS$PUT
 #define sys$qio SYS$QIO
 #define sys$qiow SYS$QIOW
-#define sys$read SYS$READ
-#define sys$resched SYS$RESCHED
-#define sys$rewind SYS$REWIND
-#define sys$search SYS$SEARCH
-#define sys$set_security SYS$SET_SECURITY
 #define sys$setast SYS$SETAST
 #define sys$setef SYS$SETEF
-#define sys$setimr SYS$SETIMR
-#define sys$setpri SYS$SETPRI
-#define sys$setprn SYS$SETPRN
-#define sys$setprv SYS$SETPRV
-#define sys$setswm SYS$SETSWM
-#define sys$setuai SYS$SETUAI
-#define sys$sndopr SYS$SNDOPR
 #define sys$synch SYS$SYNCH
-#define sys$trnlnm SYS$TRNLNM
-#define sys$update SYS$UPDATE
-#define sys$wake SYS$WAKE
-#define sys$write SYS$WRITE
 #define topLevelShellClassRec TOPLEVELSHELLCLASSREC
 #define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS
 #define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS

lib/VMS_X11_UNIV.OPT

@@ -1,11 +0,0 @@
-wx_root:[wxwidgets.lib]libwx_x11_univ.olb/lib
-sys$library:libjpeg.olb/lib
-sys$library:libpng.olb/lib
-sys$library:libz.olb/lib
-sys$library:tiff.olb/lib
-X11:libxpm.olb/lib
-sys$share:iodbc.exe/share
-sys$share:vms_jackets.exe/share
-sys$share:pthread$rtl.exe/share
-sys$library:decw$xextlibshr.exe/share
-sys$library:decw$xlibshr.exe/share

samples/checklst/checklst.cpp

@@ -129,14 +129,14 @@ bool CheckListBoxApp::OnInit(void)
                                     );
     SetTopWindow(pFrame);
 
-    return true;
+    return TRUE;
 }
 
 // main frame constructor
 CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
                                      const wxChar *title,
                                      int x, int y, int w, int h)
-                 : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
+                 : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
     // create the status line
     const int widths[] = { -1, 60 };
@@ -170,7 +170,7 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     SetMenuBar(menu_bar);
 
     // make a panel with some controls
-    m_panel = new wxPanel(this, wxID_ANY, wxPoint(0, 0),
+    m_panel = new wxPanel(this, -1, wxPoint(0, 0),
                           wxSize(400, 200), wxTAB_TRAVERSAL);
 
     CreateCheckListbox();
@@ -192,13 +192,13 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     mainsizer->Add( bottomsizer, 0, wxCENTER );
 
     // tell frame to make use of sizer (or constraints, if any)
-    m_panel->SetAutoLayout( true );
+    m_panel->SetAutoLayout( TRUE );
     m_panel->SetSizer( mainsizer );
 
     // don't allow frame to get smaller than what the sizers tell ye
     mainsizer->SetSizeHints( this );
 
-    Show(true);
+    Show(TRUE);
 }
 
 void CheckListBoxFrame::CreateCheckListbox(long flags)
@@ -247,7 +247,7 @@ CheckListBoxFrame::~CheckListBoxFrame()
 
 void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(true);
+    Close(TRUE);
 }
 
 void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -266,7 +266,7 @@ void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& WXUNUSED(event))
 void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& WXUNUSED(event))
 {
     if ( !m_pListBox->IsEmpty() )
-        m_pListBox->Check(0, false);
+        m_pListBox->Check(0, FALSE);
 }
 
 void CheckListBoxFrame::OnToggleFirstItem(wxCommandEvent& WXUNUSED(event))
@@ -304,35 +304,13 @@ void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();
     wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel,
-                      m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));
+                      m_pListBox->IsChecked(nSel) ? _T("") : wxT("not "));
 }
 
 void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 {
-    int selection = -1;
-    if(m_pListBox->GetWindowStyle() & wxLB_EXTENDED)
-    {
-        wxArrayInt list;
-        m_pListBox->GetSelections(list);
-        if(list.Count()==1)
-        {
-            selection = list.Item(0);
-        }
-    }
-    else
-    {
-        selection = m_pListBox->GetSelection();
-    }
-
     wxString strSelection;
-    if ( selection != -1 )
-    {
-        strSelection.Printf(wxT("Item %d double clicked"), selection);
-    }
-    else
-    {
-        strSelection = wxT("List double clicked in multiple selection mode");
-    }
+    strSelection.Printf(wxT("Item %d double clicked"), m_pListBox->GetSelection());
     wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);
     dialog.ShowModal();
 }
@@ -347,30 +325,17 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event)
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 {
-    OnButtonMove(true);
+    OnButtonMove(TRUE);
 }
 
 void CheckListBoxFrame::OnButtonDown(wxCommandEvent& WXUNUSED(event))
 {
-    OnButtonMove(false);
+    OnButtonMove(FALSE);
 }
 
 void CheckListBoxFrame::OnButtonMove(bool up)
 {
-    int selection = -1;
-    if(m_pListBox->GetWindowStyle() & wxLB_EXTENDED)
-    {
-        wxArrayInt list;
-        m_pListBox->GetSelections(list);
-        if(list.Count()==1)
-        {
-            selection = list.Item(0);
-        }
-    }
-    else
-    {
-        selection = m_pListBox->GetSelection();
-    }
+    int selection = m_pListBox->GetSelection();
     if ( selection != -1 )
     {
         wxString label = m_pListBox->GetString(selection);
@@ -404,20 +369,16 @@ void CheckListBoxFrame::OnButtonMove(bool up)
     }
     else
     {
-        wxLogStatus(this, wxT("Please select single item"));
+        wxLogStatus(this, wxT("Please select an item"));
     }
 }
 
-// not implemented in ports other than (native) MSW yet
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 void CheckListBoxFrame::AdjustColour(size_t index)
 {
+    // not implemented in ports other than (native) MSW yet
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     // even items have grey backround, odd ones - white
     unsigned char c = index % 2 ? 255 : 200;
     m_pListBox->GetItem(index)->SetBackgroundColour(wxColor(c, c, c));
-}
-#else
-void CheckListBoxFrame::AdjustColour(size_t WXUNUSED(index))
-{
-}
 #endif // wxMSW
+}

samples/controls/controlsCE.vcp

@@ -1,607 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="controlsCE" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE x86) Application" 0x8301
-# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
-# TARGTYPE "Win32 (WCE emulator) Application" 0xa601
-
-CFG=controlsCE - Win32 (WCE ARM) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "controlsCE.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "controlsCE.vcn" CFG="controlsCE - Win32 (WCE ARM) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "controlsCE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
-!MESSAGE "controlsCE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
-!MESSAGE "controlsCE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
-!MESSAGE "controlsCE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
-!MESSAGE "controlsCE - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Application")
-!MESSAGE "controlsCE - Win32 (WCE x86) Debug eVC4" (based on "Win32 (WCE x86) Application")
-!MESSAGE "controlsCE - Win32 (WCE x86) Release eVC4" (based on "Win32 (WCE x86) Application")
-!MESSAGE "controlsCE - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-
-!IF  "$(CFG)" == "controlsCE - Win32 (WCE ARM) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ARMRel"
-# PROP BASE Intermediate_Dir "ARMRel"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ARMRel"
-# 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 ""
-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
-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)" == "controlsCE - Win32 (WCE ARM) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ARMDbg"
-# PROP BASE Intermediate_Dir "ARMDbg"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ARMDbg"
-# 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 ""
-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
-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)" == "controlsCE - Win32 (WCE x86) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "X86Rel"
-# PROP BASE Intermediate_Dir "X86Rel"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "X86Rel"
-# 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 /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
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# 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)" == "controlsCE - Win32 (WCE x86) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "X86Dbg"
-# PROP BASE Intermediate_Dir "X86Dbg"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "X86Dbg"
-# PROP Intermediate_Dir "X86Dbg"
-# 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 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_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 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)" == "controlsCE - 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/controlsCE.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)" == "controlsCE - 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)" == "controlsCE - 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)" == "controlsCE - 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/controlsCE.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/controlsCE.exe" /libpath:"../../lib" /subsystem:$(CESubsystem) /MACHINE:IX86
-# SUBTRACT LINK32 /incremental:no
-
-!ENDIF 
-
-# Begin Target
-
-# Name "controlsCE - Win32 (WCE ARM) Release"
-# Name "controlsCE - Win32 (WCE ARM) Debug"
-# Name "controlsCE - Win32 (WCE x86) Release"
-# Name "controlsCE - Win32 (WCE x86) Debug"
-# Name "controlsCE - Win32 (WCE emulator) Release"
-# Name "controlsCE - Win32 (WCE x86) Debug eVC4"
-# Name "controlsCE - Win32 (WCE x86) Release eVC4"
-# Name "controlsCE - Win32 (WCE emulator) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\controls.cpp
-
-!IF  "$(CFG)" == "controlsCE - Win32 (WCE ARM) Release"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE ARM) Debug"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Release"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Debug"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE emulator) Release"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Debug eVC4"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Release eVC4"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE emulator) Debug"
-
-DEP_CPP_CONTROLS=\
-	".\mondrian.xpm"\
-	".\icons\choice.xpm"\
-	".\icons\combo.xpm"\
-	".\icons\gauge.xpm"\
-	".\icons\list.xpm"\
-	".\icons\radio.xpm"\
-	".\icons\stattext.xpm"\
-	".\icons\text.xpm"
-	
-NODEP_CPP_CONTROLS=\
-	".\wx\wx.h"\
-	".\wx\wxprec.h"\
-	
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=.\controls.rc
-
-!IF  "$(CFG)" == "controlsCE - Win32 (WCE ARM) Release"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE ARM) Debug"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Release"
-
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "../../include" /i "../../samples"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Debug"
-
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "../../include" /i "../../samples"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE emulator) Release"
-
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "../../include" /i "../../samples"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Debug eVC4"
-
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "../../include" /i "../../samples"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE x86) Release eVC4"
-
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "../../include" /i "../../samples"
-
-!ELSEIF  "$(CFG)" == "controlsCE - Win32 (WCE emulator) Debug"
-
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409 /i "../../include" /i "../../samples"
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\wx\msw\blank.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\mondrian.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\bullseye.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\cdrom.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\computer.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\drive.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\file1.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\floppy.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\folder1.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\folder2.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\hand.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\magnif1.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\noentry.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pbrush.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pencil.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntleft.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\pntright.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\query.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\removble.ico
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\rightarr.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\roller.cur
-# End Source File
-# Begin Source File
-
-SOURCE=.\wx\msw\watch1.cur
-# End Source File
-# End Group
-# End Target
-# End Project

samples/controls/controlsCE.vcw

@@ -1,29 +0,0 @@
-Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "controlsCE"=.\controlsCE.vcp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-

samples/html/test/Makefile.in

@@ -159,7 +159,7 @@ test.app/Contents/PkgInfo: test$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 
 data: 
 	@mkdir -p .
-	@for f in f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm; do \
+	@for f in f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm; do \
 	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
 	cp -pRf $(srcdir)/$$f . ; \
 	fi; \

samples/html/test/listtest.htm

@@ -1,28 +0,0 @@
-<html>
-<body>
-<ul>
-  <li>This is line one, try to make page width very small</li>
-  <li>Same with line 2</li>
-</ul>
-------
-<table>
-  <tr>
-    <td>
-      <ul><li>Simple list in a table. This table cell may wrap.</li></ul>
-    </td>
-    <td>
-      Second column, unimportant
-    </td>
-  <tr>
-  <tr>
-    <td nowrap>
-      <ul><li>List in a table, this cell should not wrap</li></ul>
-    </td>
-    <td>
-      Second column, unimportant
-    </td>
-  <tr>
-</table>
-
-</body>
-</html>

samples/html/test/makefile.bcc

@@ -179,7 +179,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS)  $(OBJS)\test_test.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\test_test.obj: .\test.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**

samples/html/test/makefile.gcc

@@ -176,7 +176,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test_rc.o
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+	for %%f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\test_test.o: ./test.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<

samples/html/test/makefile.vc

@@ -262,7 +262,7 @@ $(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_test.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\test_test.obj: .\test.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**

samples/html/test/makefile.wat

@@ -216,7 +216,7 @@ $(OBJS)\test.exe :  $(TEST_OBJECTS) $(OBJS)\test_test.res
 
 data : .SYMBOLIC 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<

samples/html/test/tables.htm

@@ -109,84 +109,8 @@ kjhkj hkj hkj lkh kjh kjlh kj</TD>
 </TABLE>
 
 
-<p>
-</p>
-
-<hr size="8"/>
 
 
 
-<table cellspacing='0' cellpadding='0'>
-  <tr align='left'>
-     <td width="30%" valign='top'>Error:</td>
-     <td width='5'></td>
-     <td>Sex sells better than <b>truth and honour</b></td><td align='right'>X For President is my agenda!</td>
-  </tr>
-  <tr align='left'>
-    <td valign='top'>Command:</td>
-    <td width='5'></td>
-    <td>Go out and spread the word, <b>we shall prevail!</b></td><td>X</td>
-  </tr>
-</table>
-<br><br>
-<table cellspacing='0' cellpadding='0'>
-  <tr align='left'>
-     <td valign='top'>Error:</td>
-     <td width='5'></td>
-     <td>Sex sells better than <b>truth and honour</b></td><td align='right'>X For President is my agenda!</td>
-  </tr>
-  <tr align='left'>
-    <td valign='top'>Command:</td>
-    <td width='5'></td>
-    <td>Go out and spread the word, <b>we shall prevail!</b></td><td>X</td>
-  </tr>
-</table>
-<br><br>
-<table width="200" cellspacing='0' cellpadding='0'>
-  <tr align='left'>
-     <td valign='top'>Error:</td>
-     <td width='5'></td>
-     <td nowrap>Sex sells better than <b>truth and honour</b></td><td align='right'>X For President is my agenda!</td>
-  </tr>
-  <tr align='left'>
-    <td valign='top'>Command:</td>
-    <td width='5'></td>
-    <td>Go out and spread the word, <b>we shall prevail!</b></td><td>X</td>
-  </tr>
-</table>
-<br><br>
-<table cellspacing='0' cellpadding='0'>
-  <tr align='left'>
-    <td valign='top'>Error:</td>
-    <td width='5'></td>
-    <td>
-      <table cellspacing='0' cellpadding='0'>
-        <tr align='left'>
-           <td valign='top'>Error:</td>
-           <td width='5'></td>
-           <td>Sex sells better than <b>truth and honour</b></td><td align='right'>X For President is my agenda!</td>
-        </tr>
-        <tr align='left'>
-          <td valign='top'>Command:</td>
-          <td width='5'></td>
-          <td>Go out and spread the word, <b>we shall prevail!</b></td>
-          <td>X</td>
-        </tr>
-      </table>
-    </td>
-    <td align='right'>X For President is my agenda!</td>
-  </tr>
-  <tr align='left'>
-    <td valign='top'>Command:</td>
-    <td width='5'></td>
-    <td>Go out and spread the word, <b>we shall prevail!</b></td>
-    <td>X</td>
-  </tr>
-</table>
-<br><br>
-<table cellspacing='0' cellpadding='0'>
-  <tr>
-    <td><ul><li>Just a small test</li></ul></td>
-    <td>Really, a test!</td>
-  </tr>
-</table>
+
+

samples/html/test/test.bkl

@@ -17,8 +17,7 @@
     <wx-data id="data">
         <files>
             f.html fft.html imagemap.htm imagemap.png pic.png pic2.bmp
-            tables.htm test.htm listtest.htm i18n.gif 8859_2.htm cp1250.htm
-            regres.htm
+            tables.htm test.htm i18n.gif 8859_2.htm cp1250.htm regres.htm
         </files>
     </wx-data>
 

samples/html/test/test.htm

@@ -7,11 +7,9 @@
 <BODY TEXT="#000000" BGCOLOR="#B3B6E0" LINK="#0000FF" VLINK="#FF0000" ALINK="#000088">
 
 <font size=+2>
-<b><a href="tables.htm">click here to go to tables test page</a></b>
+<b><a href="tables.htm">click here to go to tables test page!</a></b>
 <p>
-<b><a href="tables.htm">click here to go to lists test page</a></b>
-<p>
-<b><a href="imagemap.htm">click here to go to IMAGEMAPs test page</a></b>
+<b><a href="imagemap.htm">click here to go to IMAGEMAPs test page!</a></b>
 <p>
 <b><a href="8859_2.htm">i18n demo 1 (iso8859-2)</a></b>
 <p>

samples/listctrl/listtest.cpp

@@ -78,7 +78,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(LIST_THAW, MyFrame::OnThaw)
 
     EVT_UPDATE_UI(LIST_SHOW_COL_INFO, MyFrame::OnUpdateShowColInfo)
-    EVT_UPDATE_UI(LIST_TOGGLE_MULTI_SEL, MyFrame::OnUpdateToggleMultiSel)    
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(MyListCtrl, wxListCtrl)
@@ -592,11 +591,6 @@ void MyFrame::OnToggleMultiSel(wxCommandEvent& WXUNUSED(event))
     RecreateList(flags);
 }
 
-void MyFrame::OnUpdateToggleMultiSel(wxUpdateUIEvent& event)
-{
-     event.Check((m_listCtrl->GetWindowStyleFlag() & wxLC_SINGLE_SEL) == 0);
-}
-
 void MyFrame::OnSetFgColour(wxCommandEvent& WXUNUSED(event))
 {
     m_listCtrl->SetForegroundColour(wxGetColourFromUser(this));

samples/listctrl/listtest.h

@@ -115,7 +115,6 @@ protected:
     void OnThaw(wxCommandEvent& event);
 
     void OnUpdateShowColInfo(wxUpdateUIEvent& event);
-    void OnUpdateToggleMultiSel(wxUpdateUIEvent& event);
 
     wxImageList *m_imageListNormal;
     wxImageList *m_imageListSmall;

samples/minimal/descrip.mms

@@ -16,14 +16,9 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 	   /assume=(nostdnew,noglobal_array_new)
 .else
-.ifdef __WXX11__
-CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
-.else
 CXX_DEFINE =
 .endif
 .endif
-.endif
 
 .suffixes : .cpp
 
@@ -36,10 +31,6 @@ all :
 .else
 .ifdef __WXGTK__
 	$(MMS)$(MMSQUALIFIERS) minimal_gtk.exe
-.else
-.ifdef __WXX11__
-	$(MMS)$(MMSQUALIFIERS) minimal_x11.exe
-.endif
 .endif
 .endif
 
@@ -50,11 +41,6 @@ minimal.exe : minimal.obj
 .ifdef __WXGTK__
 minimal_gtk.exe : minimal.obj
 	cxxlink/exec=minimal_gtk.exe minimal,[--.lib]vms_gtk/opt
-.else
-.ifdef __WXX11__
-minimal_x11.exe : minimal.obj
-	cxxlink/exec=minimal_x11.exe minimal,[--.lib]vms_x11_univ/opt
-.endif
 .endif
 .endif
 

samples/minimal/minimal.pbproj/.cvsignore

@@ -1 +0,0 @@
-*.pbxuser

samples/minimal/minimal.pbproj/project.pbxproj

@@ -1,867 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 38;
-	objects = {
-		0249A665FF388DC511CA2CEA = {
-			isa = PBXApplicationReference;
-			path = minimalStaticDebug.app;
-			refType = 3;
-		};
-		0249A669FF388E3911CA2CEA = {
-			isa = PBXFileReference;
-			name = "libstdc++.a";
-			path = "/usr/lib/libstdc++.a";
-			refType = 0;
-		};
-		0249A66AFF388E3911CA2CEA = {
-			fileRef = 0249A669FF388E3911CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//020
-//021
-//022
-//023
-//024
-//040
-//041
-//042
-//043
-//044
-		04313892FE3035C9C02AAC07 = {
-			buildActionMask = 2147483647;
-			files = (
-				F5F5A69902CDB04601000133,
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-//040
-//041
-//042
-//043
-//044
-//050
-//051
-//052
-//053
-//054
-		05952DFCFFF02D1B11CA0E50 = {
-			buildRules = (
-			);
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				OPTIMIZATION_CFLAGS = "-O0";
-			};
-			isa = PBXBuildStyle;
-			name = Development;
-		};
-		05952DFDFFF02D1B11CA0E50 = {
-			buildRules = (
-			);
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-			};
-			isa = PBXBuildStyle;
-			name = Deployment;
-		};
-//050
-//051
-//052
-//053
-//054
-//190
-//191
-//192
-//193
-//194
-		195DF8C9FE9D4F0611CA2CBB = {
-			children = (
-				0249A665FF388DC511CA2CEA,
-				F5A0C6B302CF7C5801000133,
-				CA8957A304D7071800000080,
-				CA89596A04D79E8B00000080,
-			);
-			isa = PBXGroup;
-			name = Products;
-			refType = 4;
-		};
-//190
-//191
-//192
-//193
-//194
-//200
-//201
-//202
-//203
-//204
-		20286C28FDCF999611CA2CEA = {
-			buildStyles = (
-				05952DFCFFF02D1B11CA0E50,
-				05952DFDFFF02D1B11CA0E50,
-			);
-			hasScannedForEncodings = 1;
-			isa = PBXProject;
-			mainGroup = 20286C29FDCF999611CA2CEA;
-			projectDirPath = "";
-			targets = (
-				20286C34FDCF999611CA2CEA,
-				F5A0C6A702CF7C5801000133,
-				CA89579504D7071800000080,
-				CA89595D04D79E8B00000080,
-			);
-		};
-		20286C29FDCF999611CA2CEA = {
-			children = (
-				20286C2AFDCF999611CA2CEA,
-				20286C2CFDCF999611CA2CEA,
-				20286C32FDCF999611CA2CEA,
-				195DF8C9FE9D4F0611CA2CBB,
-			);
-			isa = PBXGroup;
-			name = "«PROJECTNAME»";
-			path = "";
-			refType = 4;
-		};
-		20286C2AFDCF999611CA2CEA = {
-			children = (
-				F591E05701FCC5DE01000133,
-			);
-			isa = PBXGroup;
-			name = Sources;
-			path = "";
-			refType = 4;
-		};
-		20286C2CFDCF999611CA2CEA = {
-			children = (
-				F5F5A69802CDB04601000133,
-				F5A0C6BB02CF7CD901000133,
-				F5F5A69A02CDB0E101000133,
-			);
-			isa = PBXGroup;
-			name = Resources;
-			path = "";
-			refType = 4;
-		};
-		20286C32FDCF999611CA2CEA = {
-			children = (
-				F5F5A69602CDB02701000133,
-				F5A0C6B502CF7C9601000133,
-				CA89578E04D706FC00000080,
-				CA89596C04D79FED00000080,
-				20286C33FDCF999611CA2CEA,
-				CA60173504D423C000000080,
-				0249A669FF388E3911CA2CEA,
-			);
-			isa = PBXGroup;
-			name = "External Frameworks and Libraries";
-			path = "";
-			refType = 4;
-		};
-		20286C33FDCF999611CA2CEA = {
-			isa = PBXFrameworkReference;
-			name = Carbon.framework;
-			path = /System/Library/Frameworks/Carbon.framework;
-			refType = 0;
-		};
-		20286C34FDCF999611CA2CEA = {
-			buildPhases = (
-				20286C35FDCF999611CA2CEA,
-				20286C36FDCF999611CA2CEA,
-				20286C38FDCF999611CA2CEA,
-				20286C3BFDCF999611CA2CEA,
-				04313892FE3035C9C02AAC07,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicRelease.build/DerivedSources/include ../../include . - /usr/include";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -D__WXDEBUG__ -D__WXMAC__ -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRECOMPILE_PREFIX_HEADER = YES;
-				PREFIX_HEADER = ../../include/wx_pb.h;
-				PRODUCT_NAME = minimalStaticDebug;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXApplicationTarget;
-			name = StaticDebug;
-			productInstallPath = "$(HOME)/Applications";
-			productName = "«PROJECTNAME»";
-			productReference = 0249A665FF388DC511CA2CEA;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>minimalStaticDebug</string>
-	<key>CFBundleGetInfoString</key>
-	<string>minimal version 2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.samples.minimal</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleName</key>
-	<string>minimal</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.5.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 wxWindows</string>
-</dict>
-</plist>
-";
-		};
-		20286C35FDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C36FDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-				F5F5A69B02CDB0E101000133,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C38FDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-				F591E05801FCC5DE01000133,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C3BFDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-				20286C3CFDCF999611CA2CEA,
-				0249A66AFF388E3911CA2CEA,
-				F5F5A69702CDB02701000133,
-				CA60173604D423C000000080,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C3CFDCF999611CA2CEA = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//200
-//201
-//202
-//203
-//204
-//CA0
-//CA1
-//CA2
-//CA3
-//CA4
-		CA60173504D423C000000080 = {
-			isa = PBXFrameworkReference;
-			name = System.framework;
-			path = /System/Library/Frameworks/System.framework;
-			refType = 0;
-		};
-		CA60173604D423C000000080 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA60173704D423C000000080 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89578E04D706FC00000080 = {
-			isa = PBXFileReference;
-			name = libwx_macd.dylib;
-			path = ../../src/build/libwx_macd.dylib;
-			refType = 2;
-		};
-		CA89579504D7071800000080 = {
-			buildPhases = (
-				CA89579604D7071800000080,
-				CA89579704D7071800000080,
-				CA89579904D7071800000080,
-				CA89579B04D7071800000080,
-				CA8957A104D7071800000080,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicDebug.build/DerivedSources/include ../../include . - /usr/include";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -D__WXDEBUG__ -DWXUSINGDLL -D__WXMAC__ -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRECOMPILE_PREFIX_HEADER = YES;
-				PREFIX_HEADER = ../../include/wx_pb.h;
-				PRODUCT_NAME = minimalDynamicDebug;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXApplicationTarget;
-			name = DynamicDebug;
-			productInstallPath = "$(HOME)/Applications";
-			productName = "«PROJECTNAME»";
-			productReference = CA8957A304D7071800000080;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>minimalDynamicDebug</string>
-	<key>CFBundleGetInfoString</key>
-	<string>minimal version 2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.samples.minimal</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleName</key>
-	<string>minimal</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.5.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 wxWindows</string>
-</dict>
-</plist>
-";
-		};
-		CA89579604D7071800000080 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89579704D7071800000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89579804D7071800000080,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89579804D7071800000080 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89579904D7071800000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89579A04D7071800000080,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89579A04D7071800000080 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89579B04D7071800000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89579C04D7071800000080,
-				CA89579D04D7071800000080,
-				CA89579F04D7071800000080,
-				CA8957A004D7071800000080,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89579C04D7071800000080 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89579D04D7071800000080 = {
-			fileRef = 0249A669FF388E3911CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89579F04D7071800000080 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA8957A004D7071800000080 = {
-			fileRef = CA89578E04D706FC00000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA8957A104D7071800000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA8957A204D7071800000080,
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA8957A204D7071800000080 = {
-			fileRef = F5F5A69802CDB04601000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA8957A304D7071800000080 = {
-			isa = PBXApplicationReference;
-			path = minimalDynamicDebug.app;
-			refType = 3;
-		};
-		CA89595D04D79E8B00000080 = {
-			buildPhases = (
-				CA89595E04D79E8B00000080,
-				CA89595F04D79E8B00000080,
-				CA89596104D79E8B00000080,
-				CA89596304D79E8B00000080,
-				CA89596804D79E8B00000080,
-			);
-			buildSettings = {
-				DEBUGGING_SYMBOLS = NO;
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxDynamicRelease.build/DerivedSources/include ../../include . - /usr/include";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OPTIMIZATION_CFLAGS = "-O3";
-				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -DWXUSINGDLL -D__WXMAC__ -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRECOMPILE_PREFIX_HEADER = YES;
-				PREFIX_HEADER = ../../include/wx_pb.h;
-				PRODUCT_NAME = minimalDynamicRelease;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXApplicationTarget;
-			name = DynamicRelease;
-			productInstallPath = "$(HOME)/Applications";
-			productName = "«PROJECTNAME»";
-			productReference = CA89596A04D79E8B00000080;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>minimalDynamicRelease</string>
-	<key>CFBundleGetInfoString</key>
-	<string>minimal version 2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.samples.minimal</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleName</key>
-	<string>minimal</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.5.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 wxWindows</string>
-</dict>
-</plist>
-";
-		};
-		CA89595E04D79E8B00000080 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89595F04D79E8B00000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89596004D79E8B00000080,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89596004D79E8B00000080 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89596104D79E8B00000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89596204D79E8B00000080,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89596204D79E8B00000080 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89596304D79E8B00000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89596404D79E8B00000080,
-				CA89596504D79E8B00000080,
-				CA89596704D79E8B00000080,
-				CA89596D04D79FED00000080,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89596404D79E8B00000080 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89596504D79E8B00000080 = {
-			fileRef = 0249A669FF388E3911CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89596704D79E8B00000080 = {
-			fileRef = CA60173504D423C000000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89596804D79E8B00000080 = {
-			buildActionMask = 2147483647;
-			files = (
-				CA89596904D79E8B00000080,
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CA89596904D79E8B00000080 = {
-			fileRef = F5A0C6BB02CF7CD901000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		CA89596A04D79E8B00000080 = {
-			isa = PBXApplicationReference;
-			path = minimalDynamicRelease.app;
-			refType = 3;
-		};
-		CA89596C04D79FED00000080 = {
-			isa = PBXFileReference;
-			name = libwx_mac.dylib;
-			path = ../../src/build/libwx_mac.dylib;
-			refType = 2;
-		};
-		CA89596D04D79FED00000080 = {
-			fileRef = CA89596C04D79FED00000080;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//CA0
-//CA1
-//CA2
-//CA3
-//CA4
-//F50
-//F51
-//F52
-//F53
-//F54
-		F591E05701FCC5DE01000133 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			path = minimal.cpp;
-			refType = 2;
-		};
-		F591E05801FCC5DE01000133 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5A0C6A702CF7C5801000133 = {
-			buildPhases = (
-				F5A0C6A802CF7C5801000133,
-				F5A0C6A902CF7C5801000133,
-				F5A0C6AB02CF7C5801000133,
-				F5A0C6AD02CF7C5801000133,
-				F5A0C6B102CF7C5801000133,
-			);
-			buildSettings = {
-				DEBUGGING_SYMBOLS = NO;
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "../../src/build/wxWindows.build/wxStaticRelease.build/DerivedSources/include ../../include . - /usr/include";
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = ../../src/build;
-				OPTIMIZATION_CFLAGS = "-O3";
-				OTHER_CFLAGS = "-DNO_GCC_PRAGMA -D__WXMAC__ -fno-rtti -fno-exceptions -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES";
-				OTHER_LDFLAGS = "";
-				OTHER_RESMERGERFLAGS = "-srcIs DF";
-				OTHER_REZFLAGS = "";
-				PRECOMPILE_PREFIX_HEADER = YES;
-				PREFIX_HEADER = ../../include/wx_pb.h;
-				PRODUCT_NAME = minimalStaticRelease;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXApplicationTarget;
-			name = StaticRelease;
-			productInstallPath = "$(HOME)/Applications";
-			productName = "«PROJECTNAME»";
-			productReference = F5A0C6B302CF7C5801000133;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>minimalStaticRelease</string>
-	<key>CFBundleGetInfoString</key>
-	<string>minimal version 2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.samples.minimal</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>2.5.0, (c) 2003 wxWindows</string>
-	<key>CFBundleName</key>
-	<string>minimal</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>2.5.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>2.5.0</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>LSRequiresCarbon</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003 wxWindows</string>
-</dict>
-</plist>
-";
-		};
-		F5A0C6A802CF7C5801000133 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F5A0C6A902CF7C5801000133 = {
-			buildActionMask = 2147483647;
-			files = (
-				F5A0C6AA02CF7C5801000133,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F5A0C6AA02CF7C5801000133 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5A0C6AB02CF7C5801000133 = {
-			buildActionMask = 2147483647;
-			files = (
-				F5A0C6AC02CF7C5801000133,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F5A0C6AC02CF7C5801000133 = {
-			fileRef = F591E05701FCC5DE01000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5A0C6AD02CF7C5801000133 = {
-			buildActionMask = 2147483647;
-			files = (
-				F5A0C6AE02CF7C5801000133,
-				F5A0C6AF02CF7C5801000133,
-				F5A0C6BA02CF7C9901000133,
-				CA60173704D423C000000080,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F5A0C6AE02CF7C5801000133 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5A0C6AF02CF7C5801000133 = {
-			fileRef = 0249A669FF388E3911CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5A0C6B102CF7C5801000133 = {
-			buildActionMask = 2147483647;
-			files = (
-				F5A0C6BD02CF7CE301000133,
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F5A0C6B302CF7C5801000133 = {
-			isa = PBXApplicationReference;
-			path = minimalStaticRelease.app;
-			refType = 3;
-		};
-		F5A0C6B502CF7C9601000133 = {
-			isa = PBXFileReference;
-			name = libwx_mac.a;
-			path = ../../src/build/libwx_mac.a;
-			refType = 2;
-		};
-		F5A0C6BA02CF7C9901000133 = {
-			fileRef = F5A0C6B502CF7C9601000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5A0C6BB02CF7CD901000133 = {
-			isa = PBXFileReference;
-			name = libwx_mac.rsrc;
-			path = ../../src/build/wxWindows.build/wxStaticRelease.build/ResourceManagerResources/libwx_mac.rsrc;
-			refType = 2;
-		};
-		F5A0C6BD02CF7CE301000133 = {
-			fileRef = F5A0C6BB02CF7CD901000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5F5A69602CDB02701000133 = {
-			isa = PBXFileReference;
-			name = libwx_macd.a;
-			path = ../../src/build/libwx_macd.a;
-			refType = 2;
-		};
-		F5F5A69702CDB02701000133 = {
-			fileRef = F5F5A69602CDB02701000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5F5A69802CDB04601000133 = {
-			isa = PBXFileReference;
-			name = libwx_macd.rsrc;
-			path = ../../src/build/wxWindows.build/wxStaticDebug.build/ResourceManagerResources/libwx_macd.rsrc;
-			refType = 2;
-		};
-		F5F5A69902CDB04601000133 = {
-			fileRef = F5F5A69802CDB04601000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F5F5A69A02CDB0E101000133 = {
-			isa = PBXFileReference;
-			name = wxmac.icns;
-			path = ../../src/mac/wxmac.icns;
-			refType = 2;
-		};
-		F5F5A69B02CDB0E101000133 = {
-			fileRef = F5F5A69A02CDB0E101000133;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-	};
-	rootObject = 20286C28FDCF999611CA2CEA;
-}

samples/sound/Makefile.in

@@ -158,7 +158,7 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
 
 data: 
 	@mkdir -p .
-	@for f in 9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav; do \
+	@for f in 9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav; do \
 	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
 	cp -pRf $(srcdir)/$$f . ; \
 	fi; \

samples/sound/makefile.bcc

@@ -175,7 +175,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sample.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**

samples/sound/makefile.gcc

@@ -172,7 +172,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample_rc.o
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %%f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+	for %%f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\sound_sample_rc.o: ./../../samples/sample.rc
 	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples

samples/sound/makefile.vc

@@ -259,7 +259,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**

samples/sound/makefile.wat

@@ -212,7 +212,7 @@ $(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 
 data : .SYMBOLIC 
 	if not exist $(OBJS) mkdir $(OBJS)
-	for %f in (9000g.wav cuckoo.wav doggrowl.wav tinkalink2.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+	for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\sound_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
 	wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<

samples/sound/sound.bkl

@@ -14,7 +14,8 @@
     
     <wx-data id="data">
         <files>
-           9000g.wav  cuckoo.wav  doggrowl.wav  tinkalink2.wav
+	    9000g.wav  911ch.wav  chord.wav  cuckoo.wav  
+	    ding.wav  doggrowl.wav  notify.wav
 	</files>
     </wx-data>
 

samples/sound/sound.cpp

@@ -180,8 +180,7 @@ MyFrame::MyFrame(const wxString& title)
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
-    m_tc = new wxTextCtrl(this, -1, wxEmptyString,
-                          wxDefaultPosition, wxDefaultSize,
+    m_tc = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize,
                           wxTE_MULTILINE|wxTE_READONLY);
     NotifyUsingFile(m_soundFile);
 }

samples/splitter/splitter.cpp

@@ -108,7 +108,7 @@ public:
     void OnPositionChanged(wxSplitterEvent& event);
     void OnPositionChanging(wxSplitterEvent& event);
     void OnDClick(wxSplitterEvent& event);
-    void OnUnsplitEvent(wxSplitterEvent& event);
+    void OnUnsplit(wxSplitterEvent& event);
 
 private:
     wxFrame *m_frame;
@@ -146,9 +146,9 @@ bool MyApp::OnInit()
     // create and show the main frame
     MyFrame* frame = new MyFrame;
 
-    frame->Show(true);
+    frame->Show(TRUE);
 
-    return true;
+    return TRUE;
 }
 
 // ----------------------------------------------------------------------------
@@ -172,7 +172,7 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame()
-       : wxFrame(NULL, wxID_ANY, _T("wxSplitterWindow sample"),
+       : wxFrame(NULL, -1, _T("wxSplitterWindow sample"),
                  wxDefaultPosition, wxSize(420, 300),
                  wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
@@ -209,7 +209,7 @@ MyFrame::MyFrame()
 
     SetMenuBar(menuBar);
 
-    menuBar->Check(SPLIT_LIVE, true);
+    menuBar->Check(SPLIT_LIVE, TRUE);
     m_splitter = new MySplitterWindow(this);
 
 #if 1
@@ -222,13 +222,13 @@ MyFrame::MyFrame()
     m_right->SetBackgroundColour(*wxCYAN);
     m_right->SetScrollbars(20, 20, 5, 5);
 #else // for testing kbd navigation inside the splitter
-    m_left = new wxTextCtrl(m_splitter, wxID_ANY, _T("first text"));
-    m_right = new wxTextCtrl(m_splitter, wxID_ANY, _T("second text"));
+    m_left = new wxTextCtrl(m_splitter, -1, _T("first text"));
+    m_right = new wxTextCtrl(m_splitter, -1, _T("second text"));
 #endif
 
     // you can also do this to start with a single window
 #if 0
-    m_right->Show(false);
+    m_right->Show(FALSE);
     m_splitter->Initialize(m_left);
 #else
     // you can also try -100
@@ -246,15 +246,15 @@ MyFrame::~MyFrame()
 
 void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) )
 {
-    Close(true);
+    Close(TRUE);
 }
 
 void MyFrame::SplitHorizontal(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
-    m_left->Show(true);
-    m_right->Show(true);
+    m_left->Show(TRUE);
+    m_right->Show(TRUE);
     m_splitter->SplitHorizontally( m_left, m_right );
 
     SetStatusText(_T("Splitter split horizontally"), 1);
@@ -264,8 +264,8 @@ void MyFrame::SplitVertical(wxCommandEvent& WXUNUSED(event) )
 {
     if ( m_splitter->IsSplit() )
         m_splitter->Unsplit();
-    m_left->Show(true);
-    m_right->Show(true);
+    m_left->Show(TRUE);
+    m_right->Show(TRUE);
     m_splitter->SplitVertically( m_left, m_right );
 
     SetStatusText(_T("Splitter split vertically"), 1);
@@ -345,16 +345,16 @@ void MyFrame::UpdateUIUnsplit(wxUpdateUIEvent& event)
 // ----------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MySplitterWindow, wxSplitterWindow)
-    EVT_SPLITTER_SASH_POS_CHANGED(wxID_ANY, MySplitterWindow::OnPositionChanged)
-    EVT_SPLITTER_SASH_POS_CHANGING(wxID_ANY, MySplitterWindow::OnPositionChanging)
+    EVT_SPLITTER_SASH_POS_CHANGED(-1, MySplitterWindow::OnPositionChanged)
+    EVT_SPLITTER_SASH_POS_CHANGING(-1, MySplitterWindow::OnPositionChanging)
 
-    EVT_SPLITTER_DCLICK(wxID_ANY, MySplitterWindow::OnDClick)
+    EVT_SPLITTER_DCLICK(-1, MySplitterWindow::OnDClick)
 
-    EVT_SPLITTER_UNSPLIT(wxID_ANY, MySplitterWindow::OnUnsplitEvent)
+    EVT_SPLITTER_UNSPLIT(-1, MySplitterWindow::OnUnsplit)
 END_EVENT_TABLE()
 
 MySplitterWindow::MySplitterWindow(wxFrame *parent)
-                : wxSplitterWindow(parent, wxID_ANY,
+                : wxSplitterWindow(parent, -1,
                                    wxDefaultPosition, wxDefaultSize,
                                    wxSP_3D | wxSP_LIVE_UPDATE |
                                    wxCLIP_CHILDREN /* | wxSP_NO_XP_THEME */ )
@@ -385,7 +385,7 @@ void MySplitterWindow::OnDClick(wxSplitterEvent& event)
     event.Skip();
 }
 
-void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
+void MySplitterWindow::OnUnsplit(wxSplitterEvent& event)
 {
     m_frame->SetStatusText(_T("Splitter unsplit"), 1);
 
@@ -397,7 +397,7 @@ void MySplitterWindow::OnUnsplitEvent(wxSplitterEvent& event)
 // ----------------------------------------------------------------------------
 
 MyCanvas::MyCanvas(wxWindow* parent, bool mirror)
-        : wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+        : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
                            wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     m_mirror = mirror;

samples/taskbar/Makefile.in

@@ -41,9 +41,9 @@ LIBDIRNAME = $(top_builddir)lib
 TASKBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 TASKBAR_OBJECTS =  \
-	$(__taskbar___win32rc) \
 	$(__taskbar_os2_lib_res) \
-	taskbar_tbtest.o
+	taskbar_tbtest.o \
+	$(__taskbar___win32rc)
 
 ### Conditionally set variables: ###
 
@@ -69,7 +69,6 @@ TASKBAR_OBJECTS =  \
 COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd = $(NM) taskbar$(EXEEXT) | if \
 	grep -q pmwin.763 ; then emxbind -ep taskbar$(EXEEXT) ; fi
 @COND_PLATFORM_OS2_1@__taskbar___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___taskbar___os2_emxbindcmd)
-@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_sample_rc.o
 @COND_PLATFORM_OS2_1@__taskbar_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__taskbar_bundle___depname = taskbar_bundle
@@ -81,6 +80,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = \
 @COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
+@COND_PLATFORM_WIN32_1@__taskbar___win32rc = taskbar_tbtest_rc.o
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -156,12 +156,12 @@ taskbar.app/Contents/PkgInfo: taskbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 
 @COND_PLATFORM_MACOSX_1@taskbar_bundle: taskbar.app/Contents/PkgInfo
 
-taskbar_sample_rc.o: $(srcdir)/../../samples/sample.rc
-	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
-
 taskbar_tbtest.o: $(srcdir)/tbtest.cpp
 	$(CXXC) -c -o $@ $(TASKBAR_CXXFLAGS) $<
 
+taskbar_tbtest_rc.o: $(srcdir)/tbtest.rc
+	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d

samples/taskbar/makefile.bcc

@@ -168,13 +168,13 @@ clean:
 	-if exist $(OBJS)\taskbar.ilf del $(OBJS)\taskbar.ilf
 	-if exist $(OBJS)\taskbar.ils del $(OBJS)\taskbar.ils
 
-$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS)  $(OBJS)\taskbar_sample.res
+$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS)  $(OBJS)\taskbar_tbtest.res
 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-	c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\taskbar_sample.res
+	c0w32.obj $(TASKBAR_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\taskbar_tbtest.res
 |
 
-$(OBJS)\taskbar_sample.res: .\..\..\samples\sample.rc
-	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
-
 $(OBJS)\taskbar_tbtest.obj: .\tbtest.cpp
 	$(CXX) -q -c -P -o$@ $(TASKBAR_CXXFLAGS) $**
+
+$(OBJS)\taskbar_tbtest.res: .\tbtest.rc
+	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**

samples/taskbar/makefile.gcc

@@ -22,8 +22,8 @@ TASKBAR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 	$(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \
 	$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 TASKBAR_OBJECTS =  \
-	$(OBJS)\taskbar_sample_rc.o \
-	$(OBJS)\taskbar_tbtest.o
+	$(OBJS)\taskbar_tbtest.o \
+	$(OBJS)\taskbar_tbtest_rc.o
 
 ### Conditionally set variables: ###
 
@@ -168,13 +168,13 @@ clean:
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
 	-if exist $(OBJS)\taskbar.exe del $(OBJS)\taskbar.exe
 
-$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_sample_rc.o
+$(OBJS)\taskbar.exe: $(TASKBAR_OBJECTS) $(OBJS)\taskbar_tbtest_rc.o
 	$(CXX) -o $@ $(TASKBAR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
-$(OBJS)\taskbar_sample_rc.o: ./../../samples/sample.rc
-	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
-
 $(OBJS)\taskbar_tbtest.o: ./tbtest.cpp
 	$(CXX) -c -o $@ $(TASKBAR_CXXFLAGS) $<
 
+$(OBJS)\taskbar_tbtest_rc.o: ./tbtest.rc
+	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+
 .PHONY: all clean