added option for getting visible region w/o children clipped

[wxWidgets.git] / src / mac / combobox.cpp

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index 1689c1549076bf34bb11a4c973778aab0c593fb9..4fa350e70970e8e776aec6bad0cfecb8e23b10a5 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR
 // Created:     ??/??/98
 // RCS-ID:      $Id$
 // Copyright:   (c) AUTHOR

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -14,54 +14,243 @@
 #endif
 
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"

+#include "wx/menu.h"

 #include "wx/mac/uma.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #endif
 
 #include "wx/mac/uma.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 #endif
 

-// right now we don't support editable comboboxes
+// composite combobox implementation by Dan "Bud" Keith bud@otsys.com
+
+
+static int nextPopUpMenuId = 1000 ;
+MenuHandle NewUniqueMenu() 
+{
+  MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+  nextPopUpMenuId++ ;
+  return handle ;
+}
+
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// the margin between the text control and the choice
+static const wxCoord MARGIN = 2;
+static const int    POPUPWIDTH = 18;
+static const int    POPUPHEIGHT = 23;
+
+
+// ----------------------------------------------------------------------------
+// wxComboBoxText: text control forwards events to combobox
+// ----------------------------------------------------------------------------
+
+class wxComboBoxText : public wxTextCtrl
+{
+public:
+    wxComboBoxText( wxComboBox * cb )
+        : wxTextCtrl( cb , 1 )
+    {
+        m_cb = cb;
+    }
+
+protected:
+    void OnTextChange( wxCommandEvent& event )
+    {
+        wxString    s = GetValue();
+        
+        if (!s.IsEmpty())
+            m_cb->DelegateTextChanged( s );
+
+        event.Skip();
+    }
+
+private:
+    wxComboBox *m_cb;
+
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxComboBoxText, wxTextCtrl)
+    EVT_TEXT(-1, wxComboBoxText::OnTextChange)
+END_EVENT_TABLE()
+
+class wxComboBoxChoice : public wxChoice
+{
+public:
+    wxComboBoxChoice(wxComboBox *cb, int style)
+        : wxChoice( cb , 1 )
+    {
+        m_cb = cb;
+    }
+
+protected:
+    void OnChoice( wxCommandEvent& e )
+    {
+        wxString    s = e.GetString();
+
+        m_cb->DelegateChoice( s );
+    }
+
+private:
+    wxComboBox *m_cb;
+
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
+    EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
+END_EVENT_TABLE()
+
+wxComboBox::~wxComboBox()
+{
+   // delete the controls now, don't leave them alive even though they would
+    // still be eventually deleted by our parent - but it will be too late, the
+    // user code expects them to be gone now
+    if (m_text != NULL) {
+        delete m_text;
+        m_text = NULL;
+    }
+    if (m_choice != NULL) {
+        delete m_choice;
+        m_choice = NULL;
+    }
+}
+
+
+// ----------------------------------------------------------------------------
+// geometry
+// ----------------------------------------------------------------------------
+
+wxSize wxComboBox::DoGetBestSize() const
+{
+    wxSize size = m_choice->GetBestSize();
+    
+    if ( m_text != 0 )
+    {
+        wxSize  sizeText = m_text->GetBestSize();
+        
+        size.x = POPUPWIDTH + sizeText.x + MARGIN;
+    }
+
+    return size;
+}
+
+void wxComboBox::DoMoveWindow(int x, int y, int width, int height) {
+    height = POPUPHEIGHT;
+    
+    wxControl::DoMoveWindow(x, y, width, height);
+
+    if ( m_text == 0 )
+    {
+        m_choice->SetSize(0, 0 , width, -1);
+    }
+    else
+    {
+        wxCoord wText = width - POPUPWIDTH;
+        m_text->SetSize(0, 0, wText, height);
+        m_choice->SetSize(0 + wText + MARGIN, 0, POPUPWIDTH, -1);
+    }    
+}
+
+
+
+// ----------------------------------------------------------------------------
+// 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()
+ {
+    m_text->SetFocus();
+ }
+
+
+void wxComboBox::DelegateTextChanged( const wxString& 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,
 
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,

-                  int n, const wxString choices[],
-                  long style,
+           int n, const wxString choices[],
+           long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    m_noStrings = n;
-
-               Rect bounds ;
-               Str255 title ;
-       
-               MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
-       
-               m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0, 
-               kControlPopupButtonProc , (long) this ) ; 
-       
-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
-               SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
-               for ( int i = 0 ; i < n ; i++ )
-               {
-                       Str255 label;
-                       wxMenuItem::MacBuildMenuString( label , NULL , NULL , choices[i] ,false);
-                       AppendMenu( m_macPopUpMenuHandle , label ) ;
-               }
-               SetControlMinimum( m_macControl , 0 ) ;
-               SetControlMaximum( m_macControl , m_noStrings) ;
-               SetControlValue( m_macControl , 1 ) ;
-
-               MacPostControlCreate() ;
-
-       return TRUE;
+
+    Rect bounds ;
+    Str255 title ;
+
+    if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style ,
+                            wxDefaultValidator, name) )
+    {
+        return FALSE;
+    }
+
+    m_choice = new wxComboBoxChoice(this, style );
+
+    wxSize csize = size;
+    if ( style & wxCB_READONLY )
+    {
+        m_text = 0;
+    }
+    else
+    {
+        m_text = new wxComboBoxText(this);
+        if ( size.y == -1 ) {
+          csize.y = m_text->GetSize().y ;
+        }
+    }
+    
+    DoSetSize(pos.x, pos.y, csize.x, csize.y);
+    
+    for ( int i = 0 ; i < n ; i++ )
+    {
+        m_choice->DoAppend( choices[ i ] );
+    }
+
+    return TRUE;

 }
 
 wxString wxComboBox::GetValue() const
 {
 }
 
 wxString wxComboBox::GetValue() const
 {

-    return GetStringSelection() ;
+    wxString        result;
+    
+    if ( m_text == 0 )
+    {
+        result = m_choice->GetString( m_choice->GetSelection() );
+    }
+    else
+    {
+        result = m_text->GetValue();
+    }
+
+    return result;

 }
 
 void wxComboBox::SetValue(const wxString& value)
 }
 
 void wxComboBox::SetValue(const wxString& value)


@@ -72,22 +261,47 @@ void wxComboBox::SetValue(const wxString& value)
 // Clipboard operations
 void wxComboBox::Copy()
 {
 // Clipboard operations
 void wxComboBox::Copy()
 {

-    // TODO
+    if ( m_text != 0 )
+    {
+        m_text->Copy();
+    }

 }
 
 void wxComboBox::Cut()
 {
 }
 
 void wxComboBox::Cut()
 {

-    // TODO
+    if ( m_text != 0 )
+    {
+        m_text->Cut();
+    }

 }
 
 void wxComboBox::Paste()
 {
 }
 
 void wxComboBox::Paste()
 {

-    // TODO
+    if ( m_text != 0 )
+    {
+        m_text->Paste();
+    }

 }
 
 void wxComboBox::SetEditable(bool editable)
 {
 }
 
 void wxComboBox::SetEditable(bool editable)
 {

-    // TODO
+    if ( ( m_text == 0 ) && editable )
+    {
+        m_text = new wxComboBoxText( this );
+    }
+    else if ( ( m_text != 0 ) && !editable )
+    {
+        delete m_text;
+        m_text = 0;
+    }
+
+    int currentX, currentY;
+    GetPosition( &currentX, &currentY );
+    
+    int currentW, currentH;
+    GetSize( &currentW, &currentH );
+
+    DoMoveWindow( currentX, currentY, currentW, currentH );

 }
 
 void wxComboBox::SetInsertionPoint(long pos)
 }
 
 void wxComboBox::SetInsertionPoint(long pos)


@@ -129,57 +343,46 @@ void wxComboBox::SetSelection(long from, long to)
 
 void wxComboBox::Append(const wxString& item)
 {
 
 void wxComboBox::Append(const wxString& item)
 {

-       Str255 label;
-       wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
-       AppendMenu( m_macPopUpMenuHandle , label ) ;
-    m_noStrings ++;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    // I am not sure what other ports do,
+    // but wxMac chokes on empty entries.
+
+    if (!item.IsEmpty())
+        m_choice->DoAppend( item );

 }
 
 void wxComboBox::Delete(int n)
 {
 }
 
 void wxComboBox::Delete(int n)
 {

-       wxASSERT( n < m_noStrings ) ;
-    ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
-    m_noStrings --;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    m_choice->Delete( n );

 }
 
 void wxComboBox::Clear()
 {
 }
 
 void wxComboBox::Clear()
 {

-    for ( int i = 0 ; i < m_noStrings ; i++ )
-    {
-       ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-       }
-    m_noStrings = 0;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    m_choice->Clear();

 }
 
 int wxComboBox::GetSelection() const
 {
 }
 
 int wxComboBox::GetSelection() const
 {

-    return GetControlValue( m_macControl ) -1 ;
+    return m_choice->GetSelection();

 }
 
 void wxComboBox::SetSelection(int n)
 {
 }
 
 void wxComboBox::SetSelection(int n)
 {

-    SetControlValue( m_macControl , n + 1 ) ;
+    m_choice->SetSelection( n );
+    
+    if ( m_text != 0 )
+    {
+        m_text->SetValue( GetString( n ) );
+    }

 }
 
 int wxComboBox::FindString(const wxString& s) const
 {
 }
 
 int wxComboBox::FindString(const wxString& s) const
 {

-    for( int i = 0 ; i < m_noStrings ; i++ )
-    {
-       if ( GetString( i ) == s )
-               return i ; 
-    }
-    return -1;
+    return m_choice->FindString( s );

 }
 
 wxString wxComboBox::GetString(int n) const
 {
 }
 
 wxString wxComboBox::GetString(int n) const
 {

-       Str255 text ;
-    ::GetMenuItemText( m_macPopUpMenuHandle , n+1 , text ) ;
-    p2cstr( text ) ;
-    return wxString( text );
+    return m_choice->GetString( n );

 }
 
 wxString wxComboBox::GetStringSelection() const
 }
 
 wxString wxComboBox::GetStringSelection() const


@@ -203,13 +406,12 @@ bool wxComboBox::SetStringSelection(const wxString& sel)
         return FALSE;
 }
 
         return FALSE;
 }
 

-void wxComboBox::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxComboBox::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 

 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );

-       event.SetInt(GetSelection());
+    event.SetInt(GetSelection());

     event.SetEventObject(this);
     event.SetEventObject(this);

-    event.SetString(copystring(GetStringSelection()));
+    event.SetString(GetStringSelection());

     ProcessCommand(event);
     ProcessCommand(event);

-    delete[] event.GetString();

 }
 
 }