cw pro 5.3 adaptions

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

src/common/datetime.cpp

@@ -95,6 +95,9 @@
 #ifndef WX_TIMEZONE
     #if defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__)
         #define WX_TIMEZONE _timezone
+    #elif defined(__WXMAC__)
+    	long wxmac_timezone = 28800;
+    	#define WX_TIMEZONE wxmac_timezone ;
     #else // unknown platform - try timezone
         #define WX_TIMEZONE timezone
     #endif

src/common/image.cpp

@@ -1113,37 +1113,6 @@ wxBitmap wxImage::ConvertToBitmap() const
     int index = 0;
     for (int y = 0; y < height; y++)
     {
-#if 0
-    	unsigned char lastr = 0 ;
-    	unsigned char lastg = 0 ;
-    	unsigned char lastb = 0 ;
-       	RGBColor lastcolor ;
-
-		MoveTo( 0 , y ) ;       	
-        for (int x = 0; x < width; x++)
-        {
-	    	unsigned char r = data[index++];
-    		unsigned char g = data[index++];
-    		unsigned char b = data[index++];
-
- 			if ( r != lastr || g != lastg || b != lastb )
- 			{
-       			lastcolor.red = ( lastr  << 8 ) + lastr ;
-       			lastcolor.green = ( lastg << 8 ) + lastg ;
-       			lastcolor.blue = ( lastb << 8 ) + lastb ;
-				RGBForeColor( &lastcolor ) ;
- 				LineTo( x , y ) ;
- 				lastr = r ;
- 				lastg = g ;
- 				lastb = b ;	
- 			}
-        } // for width
-		lastcolor.red = ( lastr  << 8 ) + lastr ;
-		lastcolor.green = ( lastg << 8 ) + lastg ;
-		lastcolor.blue = ( lastb << 8 ) + lastb ;
-		RGBForeColor( &lastcolor ) ;
-        LineTo( width - 1 , y ) ;
-#else
         for (int x = 0; x < width; x++)
         {
 	    	unsigned char r = data[index++];
@@ -1155,7 +1124,6 @@ wxBitmap wxImage::ConvertToBitmap() const
        		color.blue = ( b << 8 ) + b ;
        		SetCPixel( x , y , &color ) ;
        	}
-#endif
     }  // for height
 
    	SetGWorld( origPort , origDevice ) ;

src/common/log.cpp

@@ -398,6 +398,9 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 #if defined(__WXMSW__) && wxUSE_GUI
     OutputDebugString(str + wxT("\r\n"));
 #endif // MSW
+#if defined(__WXMAC__) && wxUSE_GUI
+    debugstr(str + wxT("\r\n"));
+#endif // MSW
 }
 
 // ----------------------------------------------------------------------------

src/common/resource.cpp

@@ -79,6 +79,7 @@
 #include "wx/wxexpr.h"
 
 #include "wx/settings.h"
+#include "wx/stream.h"
 
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
@@ -93,6 +94,7 @@ wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr);
 wxFont wxResourceInterpretFontSpec(wxExpr *expr);
 
 bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
+bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table) ;
 bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxResourceTable *) NULL);
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
@@ -208,6 +210,19 @@ bool wxResourceTable::DeleteResource(const wxString& name)
     return FALSE;
 }
 
+bool wxResourceTable::ParseResourceFile( wxInputStream *is )
+{
+  wxExprDatabase db;
+	int len = is->StreamSize() ;
+
+  bool eof = FALSE;
+  while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
+  {
+		wxResourceReadOneResource(is, db, &eof, this) ;
+  }
+  return wxResourceInterpretResources(*this, db);
+}
+
 bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
   wxExprDatabase db;
@@ -1537,6 +1552,49 @@ static bool wxEatWhiteSpace(FILE *fd)
       }
    return FALSE;
 }
+static bool wxEatWhiteSpace(wxInputStream *is)
+{
+  int ch = is->GetC() ;
+  if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
+  {
+    is->Ungetch(ch);
+    return TRUE;
+  }
+
+  // Eat whitespace
+  while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
+    ch = is->GetC();
+  // Check for comment
+  if (ch == '/')
+  {
+    ch = is->GetC();
+    if (ch == '*')
+    {
+      bool finished = FALSE;
+      while (!finished)
+      {
+        ch = is->GetC();
+        if (ch == EOF)
+          return FALSE;
+        if (ch == '*')
+        {
+          int newCh = is->GetC();
+          if (newCh == '/')
+            finished = TRUE;
+          else
+          {
+   					is->Ungetch(ch);
+          }
+        }
+      }
+    }
+    else // False alarm
+      return FALSE;
+  }
+  else
+    is->Ungetch(ch);
+  return wxEatWhiteSpace(is);
+}
 
 bool wxGetResourceToken(FILE *fd)
 {
@@ -1601,6 +1659,71 @@ bool wxGetResourceToken(FILE *fd)
   return TRUE;
 }
 
+bool wxGetResourceToken(wxInputStream *is)
+{
+  if (!wxResourceBuffer)
+    wxReallocateResourceBuffer();
+  wxResourceBuffer[0] = 0;
+  wxEatWhiteSpace(is);
+
+  int ch = is->GetC() ;
+  if (ch == '"')
+  {
+    // Get string
+    wxResourceBufferCount = 0;
+    ch = is->GetC();
+    while (ch != '"')
+    {
+      int actualCh = ch;
+      if (ch == EOF)
+      {
+        wxResourceBuffer[wxResourceBufferCount] = 0;
+        return FALSE;
+      }
+      // Escaped characters
+      else if (ch == '\\')
+      {
+        int newCh = is->GetC();
+        if (newCh == '"')
+          actualCh = '"';
+        else if (newCh == 10)
+          actualCh = 10;
+        else if (newCh == 13) // mac
+          actualCh = 10;
+        else
+        {
+    			is->Ungetch(newCh);
+        }
+      }
+
+      if (wxResourceBufferCount >= wxResourceBufferSize-1)
+        wxReallocateResourceBuffer();
+      wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
+      wxResourceBufferCount ++;
+      ch = is->GetC();
+    }
+    wxResourceBuffer[wxResourceBufferCount] = 0;
+  }
+  else
+  {
+    wxResourceBufferCount = 0;
+    // Any other token
+    while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
+    {
+      if (wxResourceBufferCount >= wxResourceBufferSize-1)
+        wxReallocateResourceBuffer();
+      wxResourceBuffer[wxResourceBufferCount] = (char)ch;
+      wxResourceBufferCount ++;
+
+      ch = is->GetC();
+    }
+    wxResourceBuffer[wxResourceBufferCount] = 0;
+    if (ch == EOF)
+      return FALSE;
+  }
+  return TRUE;
+}
+
 /*
  * Files are in form:
   static char *name = "....";
@@ -1737,6 +1860,135 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
   return TRUE;
 }
 
+bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
+{
+  if (!table)
+    table = wxDefaultResourceTable;
+
+  // static or #define
+  if (!wxGetResourceToken(fd))
+  {
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (strcmp(wxResourceBuffer, "#define") == 0)
+  {
+    wxGetResourceToken(fd);
+    char *name = copystring(wxResourceBuffer);
+    wxGetResourceToken(fd);
+    char *value = copystring(wxResourceBuffer);
+    if (isalpha(value[0]))
+    {
+      int val = (int)atol(value);
+      wxResourceAddIdentifier(name, val, table);
+    }
+    else
+    {
+      wxLogWarning(_("#define %s must be an integer."), name);
+      delete[] name;
+      delete[] value;
+      return FALSE;
+    }
+    delete[] name;
+    delete[] value;
+
+    return TRUE;
+  }
+  else if (strcmp(wxResourceBuffer, "#include") == 0)
+  {
+    wxGetResourceToken(fd);
+    char *name = copystring(wxResourceBuffer);
+    char *actualName = name;
+    if (name[0] == '"')
+      actualName = name + 1;
+    int len = strlen(name);
+    if ((len > 0) && (name[len-1] == '"'))
+      name[len-1] = 0;
+    if (!wxResourceParseIncludeFile(actualName, table))
+    {
+      wxLogWarning(_("Could not find resource include file %s."), actualName);
+    }
+    delete[] name;
+    return TRUE;
+  }
+  else if (strcmp(wxResourceBuffer, "static") != 0)
+  {
+    char buf[300];
+    strcpy(buf, _("Found "));
+    strncat(buf, wxResourceBuffer, 30);
+    strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+    wxLogWarning(buf);
+    return FALSE;
+  }
+
+  // char
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (strcmp(wxResourceBuffer, "char") != 0)
+  {
+    wxLogWarning(_("Expected 'char' whilst parsing resource."));
+    return FALSE;
+  }
+
+  // *name
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (wxResourceBuffer[0] != '*')
+  {
+    wxLogWarning(_("Expected '*' whilst parsing resource."));
+    return FALSE;
+  }
+  char nameBuf[100];
+  strncpy(nameBuf, wxResourceBuffer+1, 99);
+
+  // =
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (strcmp(wxResourceBuffer, "=") != 0)
+  {
+    wxLogWarning(_("Expected '=' whilst parsing resource."));
+    return FALSE;
+  }
+
+  // String
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+  else
+  {
+    if (!db.ReadPrologFromString(wxResourceBuffer))
+    {
+      wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
+      return FALSE;
+    }
+  }
+  // Semicolon
+  if (!wxGetResourceToken(fd))
+  {
+    *eof = TRUE;
+  }
+  return TRUE;
+}
+
 /*
  * Parses string window style into integer window style
  */

src/mac/bmpbuttn.cpp

@@ -56,7 +56,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 
 		kControlBehaviorOffsetContents + kControlContentPictHandle , 0, 
-	  	kControlBevelButtonNormalBevelProc , (long) this ) ;
+	  	(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 	
     m_buttonBitmap = bitmap;

src/mac/button.cpp

@@ -64,7 +64,7 @@ void wxButton::SetDefault()
   }
 }
 
-wxSize wxButton::DoGetBestSize()
+wxSize wxButton::DoGetBestSize() const
 {
     int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
 	int hBtn = 13 + 2 * m_macVerticalBorder;

src/mac/carbon/bmpbuttn.cpp

@@ -56,7 +56,7 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
 	m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , 
 		kControlBehaviorOffsetContents + kControlContentPictHandle , 0, 
-	  	kControlBevelButtonNormalBevelProc , (long) this ) ;
+	  	(( style & wxBU_AUTODRAW ) ? kControlBevelButtonSmallBevelProc : kControlBevelButtonNormalBevelProc ), (long) this ) ;
 	wxASSERT_MSG( m_macControl != NULL , "No valid mac control" ) ;
 	
     m_buttonBitmap = bitmap;

src/mac/carbon/button.cpp

@@ -64,7 +64,7 @@ void wxButton::SetDefault()
   }
 }
 
-wxSize wxButton::DoGetBestSize()
+wxSize wxButton::DoGetBestSize() const
 {
     int wBtn = m_label.Length() * 8 + 12 + 2 * m_macHorizontalBorder;
 	int hBtn = 13 + 2 * m_macVerticalBorder;

src/mac/carbon/control.cpp

@@ -18,9 +18,9 @@
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+IMPLEMENT_ABSTRACT_CLASS(wxControl, wxControlBase)
 
-BEGIN_EVENT_TABLE(wxControl, wxWindow)
+BEGIN_EVENT_TABLE(wxControl, wxControlBase)
 	EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
 	EVT_CHAR( wxControl::OnKeyDown ) 
 	EVT_PAINT( wxControl::OnPaint ) 
@@ -79,6 +79,21 @@ wxControl::~wxControl()
     }
 }
 
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size, long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+    if (rval) {
+#if wxUSE_VALIDATORS
+        SetValidator(validator);
+#endif
+    }
+    return rval;
+}
+
 void wxControl::SetLabel(const wxString& title)
 {
 	m_label = title ;
@@ -100,7 +115,7 @@ void wxControl::SetLabel(const wxString& title)
 	}
 }
 
-wxSize wxControl::DoGetBestSize()
+wxSize wxControl::DoGetBestSize() const
 {
     return wxSize(20, 20);
 }

src/mac/carbon/listbox.cpp

@@ -369,7 +369,7 @@ void wxListBox::SetString(int N, const wxString& s)
 	MacSet( N , s ) ;
 }
 
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const
 {
     return wxSize(100, 100);
 }

src/mac/carbon/menuitem.cpp

@@ -28,6 +28,12 @@
   IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 
 void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
+
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);
+}
+
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------

src/mac/carbon/spinbutt.cpp

@@ -128,7 +128,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 // size calculation
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinButton::DoGetBestSize()
+wxSize wxSpinButton::DoGetBestSize() const
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {

src/mac/carbon/statbmp.cpp

@@ -46,7 +46,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
-    bool ret = wxControl::Create( parent, id, pos, size, style , name );
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     
 	SetSizeOrDefault() ;
 	

src/mac/carbon/toolbar.cpp

@@ -26,7 +26,76 @@ END_EVENT_TABLE()
 
 #include <wx/mac/uma.h>
 
-wxToolBar::wxToolBar()
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar,
+                  int id,
+                  const wxBitmap& bitmap1,
+                  const wxBitmap& bitmap2,
+                  bool toggle,
+                  wxObject *clientData,
+                  const wxString& shortHelpString,
+                  const wxString& longHelpString)
+        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
+                            clientData, shortHelpString, longHelpString)
+    {
+        m_nSepCount = 0;
+        m_index = 0 ;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control)
+        : wxToolBarToolBase(tbar, control)
+    {
+        m_nSepCount = 1;
+        m_index = 0 ;
+    }
+
+    // set/get the number of separators which we use to cover the space used by
+    // a control in the toolbar
+    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
+    size_t GetSeparatorsCount() const { return m_nSepCount; }
+
+    int		m_index ;
+private:
+    size_t m_nSepCount;
+};
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxBitmap& bitmap1,
+                                         const wxBitmap& bitmap2,
+                                         bool toggle,
+                                         wxObject *clientData,
+                                         const wxString& shortHelpString,
+                                         const wxString& longHelpString)
+{
+    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
+                             clientData, shortHelpString, longHelpString);
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+{
+    return new wxToolBarTool(this, control);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar construction
+// ----------------------------------------------------------------------------
+
+void wxToolBar::Init()
 {
   m_maxWidth = -1;
   m_maxHeight = -1;
@@ -135,7 +204,7 @@ PicHandle MakePictWhite(GWorldPtr wp)
 const short kwxMacToolBarTopMargin = 2 ;
 const short kwxMacToolBarLeftMargin = 2 ;
 
-bool wxToolBar::CreateTools()
+bool wxToolBar::Realize()
 {
   if (m_tools.Number() == 0)
       return FALSE;
@@ -155,9 +224,9 @@ bool wxToolBar::CreateTools()
 	while (node)
 	{
 		wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->m_bitmap1.GetRefData()) ;
+		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
 		
-		if( tool->m_toolStyle != wxTOOL_STYLE_SEPARATOR )
+		if( !tool->IsSeparator() )
 		{
 			Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
 			toolrect.right = toolrect.left + toolSize.x ;
@@ -235,11 +304,6 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
     m_defaultWidth = size.x; m_defaultHeight = size.y;
 }
 
-wxSize wxToolBar::GetMaxSize() const
-{
-    return wxSize(m_maxWidth, m_maxHeight);
-}
-
 // The button size is bigger than the bitmap size
 wxSize wxToolBar::GetToolSize() const
 {
@@ -253,73 +317,69 @@ void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpar
 	{
 		if ( m_macToolHandles[index] == (void*) control )
 		{
-			OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_toggleState ) ;
+			OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->IsToggled() ) ;
 		}
 	}
 }
 
-void wxToolBar::EnableTool(int toolIndex, bool enable)
+void wxToolBar::SetRows(int nRows)
 {
-    wxNode *node = m_tools.Find((long)toolIndex);
-    if (node)
+    if ( nRows == m_maxRows )
     {
-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-        tool->m_enabled = enable;
-        // TODO enable button
+        // avoid resizing the frame uselessly
+        return;
+    }
+
+    m_maxRows = nRows;
+}
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
+{
+    MacClientToRootWindow( &x , &y ) ;
+    Point pt = { x ,y } ;
+
+	int index = 0 ;
+	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+	{
+		if ( PtInRect( pt , &(**(ControlHandle)(m_macToolHandles[index])).contrlRect) )
+		{
+			return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
 		}
 	}
 
-void wxToolBar::ToggleTool(int toolIndex, bool toggle)
+    return (wxToolBarToolBase *)NULL;
+}
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
-    wxNode *node = m_tools.Find((long)toolIndex);
-    if (node)
+        wxToolBarTool *tool = (wxToolBarTool *)t;
+}
+
+void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-        if (tool->m_isToggle)
-        {
-            tool->m_toggleState = toggle;
+       wxToolBarTool *tool = (wxToolBarTool *)t;
        // TODO: set toggle state
 }
-    }
-}
 
-void wxToolBar::ClearTools()
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
+                             wxToolBarToolBase *tool)
 {
-    // TODO
-    wxToolBarBase::ClearTools();
+    // nothing special to do here - we really create the toolbar buttons in
+    // Realize() later
+    tool->Attach(this);
+
+    return TRUE;
 }
 
-// If pushedBitmap is NULL, a reversed version of bitmap is
-// created and used as the pushed/toggled image.
-// If toggle is TRUE, the button toggles between the two states.
-
-wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
-             bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
 {
-  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);
-  tool->m_clientData = clientData;
-
-  if (xPos > -1)
-    tool->m_x = xPos;
-  else
-    tool->m_x = m_xMargin;
-
-  if (yPos > -1)
-    tool->m_y = yPos;
-  else
-    tool->m_y = m_yMargin;
-
-  tool->SetSize(GetToolSize().x, GetToolSize().y);
-
-  if ((tool->m_x + bitmap.GetWidth() + m_xMargin) > m_maxWidth)
-    m_maxWidth = (tool->m_x + tool->GetWidth() + m_xMargin);
-
-  if ((tool->m_y + bitmap.GetHeight() + m_yMargin) > m_maxHeight)
-    m_maxHeight = (tool->m_y + tool->GetHeight() + m_yMargin);
-
-  m_tools.Append((long)index, tool);
-  return tool;
+       wxToolBarTool *tool = (wxToolBarTool *)t;
+       // TODO: set toggle state
 }
 
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+{
+		return TRUE ;
+}
 #endif // wxUSE_TOOLBAR
 

src/mac/carbon/window.cpp

@@ -318,18 +318,9 @@ void wxWindow::DoGetPosition(int *x, int *y) const
     }
 }
 
-wxSize wxWindow::DoGetBestSize()
-{
-	return wxSize( 0 , 0 ) ;
-}
 
-bool wxWindow::Reparent(wxWindow *parent)
-{
-    if ( !wxWindowBase::Reparent(parent) )
-        return FALSE;
 
-    return TRUE;
-}
+
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {

src/mac/control.cpp

@@ -18,9 +18,9 @@
 #include "wx/tabctrl.h"
 #include "wx/spinbutt.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
+IMPLEMENT_ABSTRACT_CLASS(wxControl, wxControlBase)
 
-BEGIN_EVENT_TABLE(wxControl, wxWindow)
+BEGIN_EVENT_TABLE(wxControl, wxControlBase)
 	EVT_MOUSE_EVENTS( wxControl::OnMouseEvent ) 
 	EVT_CHAR( wxControl::OnKeyDown ) 
 	EVT_PAINT( wxControl::OnPaint ) 
@@ -79,6 +79,21 @@ wxControl::~wxControl()
     }
 }
 
+bool wxControl::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size, long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    bool rval = wxWindow::Create(parent, id, pos, size, style, name);
+    if (rval) {
+#if wxUSE_VALIDATORS
+        SetValidator(validator);
+#endif
+    }
+    return rval;
+}
+
 void wxControl::SetLabel(const wxString& title)
 {
 	m_label = title ;
@@ -100,7 +115,7 @@ void wxControl::SetLabel(const wxString& title)
 	}
 }
 
-wxSize wxControl::DoGetBestSize()
+wxSize wxControl::DoGetBestSize() const
 {
     return wxSize(20, 20);
 }

src/mac/listbox.cpp

@@ -369,7 +369,7 @@ void wxListBox::SetString(int N, const wxString& s)
 	MacSet( N , s ) ;
 }
 
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const
 {
     return wxSize(100, 100);
 }

src/mac/menuitem.cpp

@@ -28,6 +28,12 @@
   IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
 
 void wxMacBuildMenuString(StringPtr outMacItemText, char *outMacShortcutChar , short *outMacModifiers , const char *inItemName , bool useShortcuts ) ;
+
+wxString wxMenuItemBase::GetLabelFromText(const wxString& text)
+{
+    return wxStripMenuCodes(text);
+}
+
 // ----------------------------------------------------------------------------
 // wxMenuItem
 // ----------------------------------------------------------------------------

src/mac/spinbutt.cpp

@@ -128,7 +128,7 @@ void wxSpinButton::MacHandleControlClick( ControlHandle control , SInt16 control
 // size calculation
 // ----------------------------------------------------------------------------
 
-wxSize wxSpinButton::DoGetBestSize()
+wxSize wxSpinButton::DoGetBestSize() const
 {
     if ( (GetWindowStyle() & wxSP_VERTICAL) != 0 )
     {

src/mac/statbmp.cpp

@@ -46,7 +46,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
 
     m_windowStyle = style;
 
-    bool ret = wxControl::Create( parent, id, pos, size, style , name );
+    bool ret = wxControl::Create( parent, id, pos, size, style , wxDefaultValidator , name );
     
 	SetSizeOrDefault() ;
 	

src/mac/toolbar.cpp

@@ -26,7 +26,76 @@ END_EVENT_TABLE()
 
 #include <wx/mac/uma.h>
 
-wxToolBar::wxToolBar()
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class wxToolBarTool : public wxToolBarToolBase
+{
+public:
+    wxToolBarTool(wxToolBar *tbar,
+                  int id,
+                  const wxBitmap& bitmap1,
+                  const wxBitmap& bitmap2,
+                  bool toggle,
+                  wxObject *clientData,
+                  const wxString& shortHelpString,
+                  const wxString& longHelpString)
+        : wxToolBarToolBase(tbar, id, bitmap1, bitmap2, toggle,
+                            clientData, shortHelpString, longHelpString)
+    {
+        m_nSepCount = 0;
+        m_index = 0 ;
+    }
+
+    wxToolBarTool(wxToolBar *tbar, wxControl *control)
+        : wxToolBarToolBase(tbar, control)
+    {
+        m_nSepCount = 1;
+        m_index = 0 ;
+    }
+
+    // set/get the number of separators which we use to cover the space used by
+    // a control in the toolbar
+    void SetSeparatorsCount(size_t count) { m_nSepCount = count; }
+    size_t GetSeparatorsCount() const { return m_nSepCount; }
+
+    int		m_index ;
+private:
+    size_t m_nSepCount;
+};
+
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxToolBarTool
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBar::CreateTool(int id,
+                                         const wxBitmap& bitmap1,
+                                         const wxBitmap& bitmap2,
+                                         bool toggle,
+                                         wxObject *clientData,
+                                         const wxString& shortHelpString,
+                                         const wxString& longHelpString)
+{
+    return new wxToolBarTool(this, id, bitmap1, bitmap2, toggle,
+                             clientData, shortHelpString, longHelpString);
+}
+
+wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
+{
+    return new wxToolBarTool(this, control);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBar construction
+// ----------------------------------------------------------------------------
+
+void wxToolBar::Init()
 {
   m_maxWidth = -1;
   m_maxHeight = -1;
@@ -135,7 +204,7 @@ PicHandle MakePictWhite(GWorldPtr wp)
 const short kwxMacToolBarTopMargin = 2 ;
 const short kwxMacToolBarLeftMargin = 2 ;
 
-bool wxToolBar::CreateTools()
+bool wxToolBar::Realize()
 {
   if (m_tools.Number() == 0)
       return FALSE;
@@ -155,9 +224,9 @@ bool wxToolBar::CreateTools()
 	while (node)
 	{
 		wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->m_bitmap1.GetRefData()) ;
+		wxBitmapRefData * bmap = (wxBitmapRefData*) ( tool->GetBitmap1().GetRefData()) ;
 		
-		if( tool->m_toolStyle != wxTOOL_STYLE_SEPARATOR )
+		if( !tool->IsSeparator() )
 		{
 			Rect toolrect = { toolbarrect.top + kwxMacToolBarTopMargin , toolbarrect.left + x + kwxMacToolBarLeftMargin , 0 , 0 } ;
 			toolrect.right = toolrect.left + toolSize.x ;
@@ -235,11 +304,6 @@ void wxToolBar::SetToolBitmapSize(const wxSize& size)
     m_defaultWidth = size.x; m_defaultHeight = size.y;
 }
 
-wxSize wxToolBar::GetMaxSize() const
-{
-    return wxSize(m_maxWidth, m_maxHeight);
-}
-
 // The button size is bigger than the bitmap size
 wxSize wxToolBar::GetToolSize() const
 {
@@ -253,73 +317,69 @@ void wxToolBar::MacHandleControlClick( ControlHandle control , SInt16 controlpar
 	{
 		if ( m_macToolHandles[index] == (void*) control )
 		{
-			OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_toggleState ) ;
+			OnLeftClick( ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->m_index , ( (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ) ->IsToggled() ) ;
 		}
 	}
 }
 
-void wxToolBar::EnableTool(int toolIndex, bool enable)
+void wxToolBar::SetRows(int nRows)
 {
-    wxNode *node = m_tools.Find((long)toolIndex);
-    if (node)
+    if ( nRows == m_maxRows )
     {
-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-        tool->m_enabled = enable;
-        // TODO enable button
+        // avoid resizing the frame uselessly
+        return;
+    }
+
+    m_maxRows = nRows;
+}
+
+wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const
+{
+    MacClientToRootWindow( &x , &y ) ;
+    Point pt = { x ,y } ;
+
+	int index = 0 ;
+	for ( index = 0 ; index < m_macToolHandles.Count() ; ++index )
+	{
+		if ( PtInRect( pt , &(**(ControlHandle)(m_macToolHandles[index])).contrlRect) )
+		{
+			return  (wxToolBarTool*) (m_tools.Nth( index )->Data() ) ;
 		}
 	}
 
-void wxToolBar::ToggleTool(int toolIndex, bool toggle)
+    return (wxToolBarToolBase *)NULL;
+}
+
+void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable)
 {
-    wxNode *node = m_tools.Find((long)toolIndex);
-    if (node)
+        wxToolBarTool *tool = (wxToolBarTool *)t;
+}
+
+void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle)
 {
-        wxToolBarTool *tool = (wxToolBarTool *)node->Data();
-        if (tool->m_isToggle)
-        {
-            tool->m_toggleState = toggle;
+       wxToolBarTool *tool = (wxToolBarTool *)t;
        // TODO: set toggle state
 }
-    }
-}
 
-void wxToolBar::ClearTools()
+bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos),
+                             wxToolBarToolBase *tool)
 {
-    // TODO
-    wxToolBarBase::ClearTools();
+    // nothing special to do here - we really create the toolbar buttons in
+    // Realize() later
+    tool->Attach(this);
+
+    return TRUE;
 }
 
-// If pushedBitmap is NULL, a reversed version of bitmap is
-// created and used as the pushed/toggled image.
-// If toggle is TRUE, the button toggles between the two states.
-
-wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
-             bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
+void wxToolBar::DoSetToggle(wxToolBarToolBase *t, bool toggle)
 {
-  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);
-  tool->m_clientData = clientData;
-
-  if (xPos > -1)
-    tool->m_x = xPos;
-  else
-    tool->m_x = m_xMargin;
-
-  if (yPos > -1)
-    tool->m_y = yPos;
-  else
-    tool->m_y = m_yMargin;
-
-  tool->SetSize(GetToolSize().x, GetToolSize().y);
-
-  if ((tool->m_x + bitmap.GetWidth() + m_xMargin) > m_maxWidth)
-    m_maxWidth = (tool->m_x + tool->GetWidth() + m_xMargin);
-
-  if ((tool->m_y + bitmap.GetHeight() + m_yMargin) > m_maxHeight)
-    m_maxHeight = (tool->m_y + tool->GetHeight() + m_yMargin);
-
-  m_tools.Append((long)index, tool);
-  return tool;
+       wxToolBarTool *tool = (wxToolBarTool *)t;
+       // TODO: set toggle state
 }
 
+bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *tool)
+{
+		return TRUE ;
+}
 #endif // wxUSE_TOOLBAR
 

src/mac/window.cpp

@@ -318,18 +318,9 @@ void wxWindow::DoGetPosition(int *x, int *y) const
     }
 }
 
-wxSize wxWindow::DoGetBestSize()
-{
-	return wxSize( 0 , 0 ) ;
-}
 
-bool wxWindow::Reparent(wxWindow *parent)
-{
-    if ( !wxWindowBase::Reparent(parent) )
-        return FALSE;
 
-    return TRUE;
-}
+
 
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {