diff --git a/src/osx/cocoa/combobox.mm b/src/osx/cocoa/combobox.mm
new file mode 100644
index 0000000000..b090c3ae83
--- /dev/null
+++ b/src/osx/cocoa/combobox.mm
@@ -0,0 +1,72 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/osx/cocoa/combobox.mm
+// Purpose:     wxChoice
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id: combobox.mm 54129 2008-06-11 19:30:52Z SC $
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
+
+#include "wx/combobox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/menu.h"
+    #include "wx/dcclient.h"
+#endif
+
+#include "wx/osx/private.h"
+
+// work in progress
+
+@interface wxNSComboBox : NSComboBox
+{
+}
+
+@end
+
+@implementation wxNSComboBox
+
++ (void)initialize
+{
+    static BOOL initialized = NO;
+    if (!initialized) 
+    {
+        initialized = YES;
+        wxOSXCocoaClassAddWXMethods( self );
+    }
+}
+
+- (int) intValue
+{
+   return [self indexOfSelectedItem];
+}
+
+- (void) setIntValue: (int) v
+{
+    [self selectItemAtIndex:v];
+}
+
+@end
+
+wxWidgetImplType* wxWidgetImpl::CreateComboBox( wxWindowMac* wxpeer, 
+                                    wxWindowMac* WXUNUSED(parent), 
+                                    wxWindowID WXUNUSED(id), 
+                                    wxMenu* menu,
+                                    const wxPoint& pos, 
+                                    const wxSize& size,
+                                    long WXUNUSED(style), 
+                                    long WXUNUSED(extraStyle))
+{
+    NSRect r = wxOSXGetFrameForControl( wxpeer, pos , size ) ;
+    wxNSComboBox* v = [[wxNSComboBox alloc] initWithFrame:r pullsDown:NO];
+    wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
+    return c;
+}
+
+#endif // wxUSE_CHOICE
diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
new file mode 100644
index 0000000000..7e127cce14
--- /dev/null
+++ b/src/osx/combobox_osx.cpp
@@ -0,0 +1,628 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/osx/combobox_osx.cpp
+// Purpose:     wxComboBox class using HIView ComboBox
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id: combobox_osx.cpp 58318 2009-01-23 08:36:16Z RR $
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX
+
+#include "wx/combobox.h"
+
+#ifndef WX_PRECOMP
+#endif
+
+// work in progress
+
+IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
+
+wxComboBox::~wxComboBox()
+{
+}
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           const wxArrayString& choices,
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    wxCArrayString chs( choices );
+
+    return Create( parent, id, value, pos, size, chs.GetCount(),
+                   chs.GetStrings(), style, validator, name );
+}
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           int n, const wxString choices[],
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    m_text = NULL;
+    m_choice = NULL;
+
+    m_macIsUserPane = false;
+
+    if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
+        return false;
+        
+    m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, m_popUpMenu, pos, size, style, GetExtraStyle() );
+
+    MacPostControlCreate( pos, size );
+
+#if !wxUSE_STL
+    if ( style & wxCB_SORT )
+        // autosort
+        m_strings = wxArrayString( 1 );
+#endif
+
+    Append(n, choices);
+
+    // Set the first item as being selected
+    if (n > 0)
+        SetSelection( 0 );
+
+    // Needed because it is a wxControlWithItems
+    SetInitialSize( size );
+
+    return true;
+}
+
+// ----------------------------------------------------------------------------
+// geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxComboBox::DoGetBestSize() const
+{
+#if USE_HICOMBOBOX
+    return wxControl::DoGetBestSize();
+#else
+    wxSize size = m_choice->GetBestSize();
+
+    if ( m_text != NULL )
+    {
+        wxSize  sizeText = m_text->GetBestSize();
+
+        size.x = POPUPWIDTH + sizeText.x + MARGIN;
+    }
+
+    return size;
+#endif
+}
+
+void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
+#if USE_HICOMBOBOX
+    wxControl::DoMoveWindow(x, y, width, height);
+#else
+    height = POPUPHEIGHT;
+
+    wxControl::DoMoveWindow(x, y, width, height);
+
+    if ( m_text == NULL )
+    {
+        // we might not be fully constructed yet, therefore watch out...
+        if ( m_choice )
+            m_choice->SetSize(0, 0 , width, wxDefaultCoord);
+    }
+    else
+    {
+        wxCoord wText = width - POPUPWIDTH - MARGIN;
+        m_text->SetSize(0, 0, wText, height);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, wxDefaultCoord);
+    }
+#endif
+}
+
+
+
+// ----------------------------------------------------------------------------
+// operations forwarded to the subcontrols
+// ----------------------------------------------------------------------------
+
+bool wxComboBox::Enable(bool enable)
+{
+    if ( !wxControl::Enable(enable) )
+        return false;
+
+    return true;
+}
+
+bool wxComboBox::Show(bool show)
+{
+    if ( !wxControl::Show(show) )
+        return false;
+
+    return true;
+}
+
+void wxComboBox::SetFocus()
+{
+#if USE_HICOMBOBOX
+    wxControl::SetFocus();
+#else
+    if ( m_text != NULL) {
+        m_text->SetFocus();
+    }
+#endif
+}
+
+
+void wxComboBox::DelegateTextChanged( const wxString& value )
+{
+    SetStringSelection( value );
+}
+
+
+void wxComboBox::DelegateChoice( const wxString& value )
+{
+    SetStringSelection( value );
+}
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+           const wxString& value,
+           const wxPoint& pos,
+           const wxSize& size,
+           int n, const wxString choices[],
+           long style,
+           const wxValidator& validator,
+           const wxString& name)
+{
+    m_text = NULL;
+    m_choice = NULL;
+#if USE_HICOMBOBOX
+    m_macIsUserPane = false;
+#endif
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
+                            wxDefaultValidator, name) )
+    {
+        return false;
+    }
+#if USE_HICOMBOBOX
+    Rect bounds = wxMacGetBoundsForControl( this , pos , size );
+    HIRect hiRect;
+
+    hiRect.origin.x = 20; //bounds.left;
+    hiRect.origin.y = 25; //bounds.top;
+    hiRect.size.width = 120;// bounds.right - bounds.left;
+    hiRect.size.height = 24;
+
+    //For some reason, this code causes the combo box not to be displayed at all.
+    //hiRect.origin.x = bounds.left;
+    //hiRect.origin.y = bounds.top;
+    //hiRect.size.width = bounds.right - bounds.left;
+    //hiRect.size.height = bounds.bottom - bounds.top;
+    //printf("left = %d, right = %d, top = %d, bottom = %d\n", bounds.left, bounds.right, bounds.top, bounds.bottom);
+    //printf("x = %d, y = %d, width = %d, height = %d\n", hibounds.origin.x, hibounds.origin.y, hibounds.size.width, hibounds.size.height);
+    m_peer = new wxMacControl(this);
+    verify_noerr( HIComboBoxCreate( &hiRect, CFSTR(""), NULL, NULL, kHIComboBoxStandardAttributes, m_peer->GetControlRefAddr() ) );
+
+
+    m_peer->SetMinimum( 0 );
+    m_peer->SetMaximum( 100);
+    if ( n > 0 )
+        m_peer->SetValue( 1 );
+
+    MacPostControlCreate(pos,size);
+
+    Append( choices[ i ] );
+
+    HIViewSetVisible( m_peer->GetControlRef(), true );
+    SetSelection(0);
+    EventHandlerRef comboEventHandler;
+    InstallControlEventHandler( m_peer->GetControlRef(), GetwxMacComboBoxEventHandlerUPP(),
+        GetEventTypeCount(eventList), eventList, this,
+        (EventHandlerRef *)&comboEventHandler);
+#else
+    m_choice = new wxComboBoxChoice(this, style );
+    m_choice->SetMinSize( wxSize( POPUPWIDTH , POPUPHEIGHT ) );
+
+    wxSize csize = size;
+    if ( style & wxCB_READONLY )
+    {
+        m_text = NULL;
+    }
+    else
+    {
+        m_text = new wxComboBoxText(this);
+        if ( size.y == wxDefaultCoord ) {
+          csize.y = m_text->GetSize().y;
+        }
+    }
+
+    DoSetSize(pos.x, pos.y, csize.x, csize.y);
+
+    m_choice->Append( n, choices );
+    SetInitialSize(csize);   // Needed because it is a wxControlWithItems
+#endif
+
+    return true;
+}
+
+wxString wxComboBox::GetValue() const
+{
+#if USE_HICOMBOBOX
+    CFStringRef myString;
+    HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString );
+    return wxMacCFStringHolder( myString, GetFont().GetEncoding() ).AsString();
+#else
+    wxString        result;
+
+    if ( m_text == NULL )
+    {
+        result = m_choice->GetString( m_choice->GetSelection() );
+    }
+    else
+    {
+        result = m_text->GetValue();
+    }
+
+    return result;
+#endif
+}
+
+void wxComboBox::SetValue(const wxString& value)
+{
+#if USE_HICOMBOBOX
+
+#else
+    int s = FindString (value);
+    if (s == wxNOT_FOUND && !HasFlag(wxCB_READONLY) )
+    {
+        m_choice->Append(value);
+    }
+    SetStringSelection( value );
+#endif
+}
+
+// Clipboard operations
+void wxComboBox::Copy()
+{
+    if ( m_text != NULL )
+    {
+        m_text->Copy();
+    }
+}
+
+void wxComboBox::Cut()
+{
+    if ( m_text != NULL )
+    {
+        m_text->Cut();
+    }
+}
+
+void wxComboBox::Paste()
+{
+    if ( m_text != NULL )
+    {
+        m_text->Paste();
+    }
+}
+
+void wxComboBox::SetEditable(bool editable)
+{
+    if ( ( m_text == NULL ) && editable )
+    {
+        m_text = new wxComboBoxText( this );
+    }
+    else if ( ( m_text != NULL ) && !editable )
+    {
+        delete m_text;
+        m_text = NULL;
+    }
+
+    int currentX, currentY;
+    GetPosition( &currentX, &currentY );
+
+    int currentW, currentH;
+    GetSize( &currentW, &currentH );
+
+    DoMoveWindow( currentX, currentY, currentW, currentH );
+}
+
+void wxComboBox::SetInsertionPoint(long pos)
+{
+    // TODO
+}
+
+void wxComboBox::SetInsertionPointEnd()
+{
+    // TODO
+}
+
+long wxComboBox::GetInsertionPoint() const
+{
+    // TODO
+    return 0;
+}
+
+wxTextPos wxComboBox::GetLastPosition() const
+{
+    // TODO
+    return 0;
+}
+
+void wxComboBox::Replace(long from, long to, const wxString& value)
+{
+    // TODO
+}
+
+void wxComboBox::Remove(long from, long to)
+{
+    // TODO
+}
+
+void wxComboBox::SetSelection(long from, long to)
+{
+    // TODO
+}
+
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type)
+{
+#if USE_HICOMBOBOX
+    const unsigned int count = items.GetCount();
+    for ( unsigned int i = 0; i < count; ++i, ++pos )
+    {
+        HIComboBoxInsertTextItemAtIndex(m_peer->GetControlRef(),
+                                        (CFIndex)pos,
+                                        wxMacCFStringHolder(items[i],
+                                                            GetFont().GetEncoding()));
+        AssignNewItemClientData(pos, clientData, i, type);
+    }
+
+    //SetControl32BitMaximum( m_peer->GetControlRef(), GetCount() );
+
+    return pos - 1;
+#else
+    return m_choice->DoInsertItems( items, pos, clientData, type );
+#endif
+}
+
+void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
+{
+#if USE_HICOMBOBOX
+    return; //TODO
+#else
+    return m_choice->DoSetItemClientData( n , clientData );
+#endif
+}
+
+void* wxComboBox::DoGetItemClientData(unsigned int n) const
+{
+#if USE_HICOMBOBOX
+    return NULL; //TODO
+#else
+    return m_choice->DoGetItemClientData( n );
+#endif
+}
+
+unsigned int wxComboBox::GetCount() const {
+#if USE_HICOMBOBOX
+    return (unsigned int) HIComboBoxGetItemCount( m_peer->GetControlRef() );
+#else
+    return m_choice->GetCount();
+#endif
+}
+
+void wxComboBox::DoDeleteOneItem(unsigned int n)
+{
+#if USE_HICOMBOBOX
+    HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex)n );
+#else
+    m_choice->Delete( n );
+#endif
+}
+
+void wxComboBox::DoClear()
+{
+#if USE_HICOMBOBOX
+    for ( CFIndex i = GetCount() - 1; i >= 0; ++ i )
+        verify_noerr( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), i ) );
+    m_peer->SetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag,CFSTR(""));
+#else
+    m_choice->Clear();
+#endif
+}
+
+int wxComboBox::GetSelection() const
+{
+#if USE_HICOMBOBOX
+    return FindString( GetStringSelection() );
+#else
+    return m_choice->GetSelection();
+#endif
+}
+
+void wxComboBox::SetSelection(int n)
+{
+#if USE_HICOMBOBOX
+    SetControl32BitValue( m_peer->GetControlRef() , n + 1 );
+#else
+    m_choice->SetSelection( n );
+
+    if ( m_text != NULL )
+    {
+        m_text->SetValue(GetString(n));
+    }
+#endif
+}
+
+int wxComboBox::FindString(const wxString& s, bool bCase) const
+{
+#if USE_HICOMBOBOX
+    for( unsigned int i = 0 ; i < GetCount() ; i++ )
+    {
+        if (GetString(i).IsSameAs(s, bCase) )
+            return i ;
+    }
+    return wxNOT_FOUND;
+#else
+    return m_choice->FindString( s, bCase );
+#endif
+}
+
+wxString wxComboBox::GetString(unsigned int n) const
+{
+#if USE_HICOMBOBOX
+    CFStringRef itemText;
+    HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)n, &itemText );
+    return wxMacCFStringHolder(itemText).AsString();
+#else
+    return m_choice->GetString( n );
+#endif
+}
+
+wxString wxComboBox::GetStringSelection() const
+{
+#if USE_HICOMBOBOX
+    return wxMacCFStringHolder(m_peer->GetData<CFStringRef>(kHIComboBoxEditTextPart,kControlEditTextCFStringTag)).AsString();
+#else
+    int sel = GetSelection ();
+    if (sel != wxNOT_FOUND)
+        return wxString(this->GetString((unsigned int)sel));
+    else
+        return wxEmptyString;
+#endif
+}
+
+void wxComboBox::SetString(unsigned int n, const wxString& s)
+{
+#if USE_HICOMBOBOX
+    verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n,
+        wxMacCFStringHolder(s, GetFont().GetEncoding()) ) );
+    verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) );
+#else
+    m_choice->SetString( n , s );
+#endif
+}
+
+bool wxComboBox::IsEditable() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return !HasFlag(wxCB_READONLY);
+#else
+    return m_text != NULL && !HasFlag(wxCB_READONLY);
+#endif
+}
+
+void wxComboBox::Undo()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->Undo();
+#endif
+}
+
+void wxComboBox::Redo()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->Redo();
+#endif
+}
+
+void wxComboBox::SelectAll()
+{
+#if USE_HICOMBOBOX
+    // TODO
+#else
+    if (m_text != NULL)
+        m_text->SelectAll();
+#endif
+}
+
+bool wxComboBox::CanCopy() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanCopy();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::CanCut() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanCut();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::CanPaste() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanPaste();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::CanUndo() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanUndo();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::CanRedo() const
+{
+#if USE_HICOMBOBOX
+    // TODO
+    return false;
+#else
+    if (m_text != NULL)
+        return m_text->CanRedo();
+    else
+        return false;
+#endif
+}
+
+bool wxComboBox::OSXHandleClicked( double timestampsec )
+{
+    wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
+    event.SetInt(GetSelection());
+    event.SetEventObject(this);
+    event.SetString(GetStringSelection());
+    ProcessCommand(event);
+    return true;
+}
+
+#endif
diff --git a/src/osx/iphone/scrolbar.mm b/src/osx/iphone/scrolbar.mm
new file mode 100644
index 0000000000..caf9d25a1e
--- /dev/null
+++ b/src/osx/iphone/scrolbar.mm
@@ -0,0 +1,24 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/osx/iphone/scrolbar.mm
+// Purpose:     wxScrollBar
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01
+// RCS-ID:      $Id: scrolbar.cpp 54129 2008-06-11 19:30:52Z SC $
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#include "wx/wxprec.h"
+
+#include "wx/scrolbar.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/settings.h"
+#endif
+
+#include "wx/osx/private.h"
+
+// placeholder
\ No newline at end of file