No real changes, just cleanup week days handling in wxGenericCalendarCtrl.

[wxWidgets.git] / include / wx / gtk / combobox.h

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 63304d121f313a9bb958c9289ac7a68e81a4c286..fb718013c5f136c1cf5bc4807ef176aba63ad17c 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -1,141 +1,159 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/gtk/combobox.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+#ifndef _WX_GTK_COMBOBOX_H_
+#define _WX_GTK_COMBOBOX_H_

 
 

-#ifndef __GTKCOMBOBOXH__
-#define __GTKCOMBOBOXH__
+#include "wx/choice.h"

 
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "combobox.h"
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_COMBOBOX
-
-#include "wx/object.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxComboBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar* wxComboBoxNameStr;
-extern const wxChar* wxEmptyString;
+typedef struct _GtkEntry GtkEntry;

 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

-class wxComboBox : public wxControl
+class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
+                                    public wxTextEntry

 {
 public:
 {
 public:

-    inline wxComboBox() {}
-    inline wxComboBox(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = (const wxString *) NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
+    wxComboBox()
+        : wxChoice(), wxTextEntry()
+    {
+        Init();
+    }
+    wxComboBox(wxWindow *parent,
+               wxWindowID id,
+               const wxString& value = wxEmptyString,
+               const wxPoint& pos = wxDefaultPosition,
+               const wxSize& size = wxDefaultSize,
+               int n = 0, const wxString choices[] = NULL,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr)
+        : wxChoice(), wxTextEntry()

     {
     {

+        Init();

         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }

-    ~wxComboBox();
+
+    wxComboBox(wxWindow *parent, wxWindowID id,
+               const wxString& value,
+               const wxPoint& pos,
+               const wxSize& size,
+               const wxArrayString& choices,
+               long style = 0,
+               const wxValidator& validator = wxDefaultValidator,
+               const wxString& name = wxComboBoxNameStr)
+        : wxChoice(), wxTextEntry()
+    {
+        Init();
+        Create(parent, id, value, pos, size, choices, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& value = wxEmptyString,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = (const wxString *) NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-           const wxString& value = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = (const wxString *) NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
-
-    void Append( const wxString &item );
-    void Append( const wxString &item, void* clientData );
-    void Append( const wxString &item, wxClientData* clientData );
-  
-    void SetClientData( int n, void* clientData );
-    void* GetClientData( int n );
-    void SetClientObject( int n, wxClientData* clientData );
-    wxClientData* GetClientObject( int n );
-  
-    void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
-    wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
-    void SetClientData( void *data )            { wxControl::SetClientData( data ); }
-    void *GetClientData() const                 { return wxControl::GetClientData(); }
-    
-    void Clear();
-    void Delete( int n );
-  
-    int FindString( const wxString &item );
-    int GetSelection() const;
-    wxString GetString( int n ) const;
-    wxString GetStringSelection() const;
-    int GetCount() const { return Number(); }
-    int Number() const;
-    void SetSelection( int n );
-    void SetStringSelection( const wxString &string );
-    void SetString(int n, const wxString &text);
-
-    wxString GetValue() const;
-    void SetValue(const wxString& value);
-
-    void Copy();
-    void Cut();
-    void Paste();
-    void SetInsertionPoint( long pos );
-    void SetInsertionPointEnd();
-    long GetInsertionPoint() const;
-    long GetLastPosition() const;
-    void Replace( long from, long to, const wxString& value );
-    void Remove( long from, long to );
-    void SetSelection( long from, long to );
-    void SetEditable( bool editable );
-  
-    // implementation
-    
-    virtual void SetFocus();
-    
-    void OnSize( wxSizeEvent &event );
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
+
+    // Set/GetSelection() from wxTextEntry and wxChoice
+
+    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
+    virtual void SetSelection(long from, long to)
+                               { wxTextEntry::SetSelection(from, to); }
+
+    virtual int GetSelection() const { return wxChoice::GetSelection(); }
+    virtual void GetSelection(long *from, long *to) const
+                               { return wxTextEntry::GetSelection(from, to); }
+
+    virtual wxString GetStringSelection() const
+    {
+        return wxItemContainer::GetStringSelection();
+    }
+    virtual void Popup();
+    virtual void Dismiss();
+
+    virtual void Clear()
+    {
+        wxTextEntry::Clear();
+        wxItemContainer::Clear();
+    }
+
+    bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+

     void OnChar( wxKeyEvent &event );
     void OnChar( wxKeyEvent &event );

-  
-    bool     m_alreadySent;
-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
-    int      m_prevSelection;
-
-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );
+
+    virtual void SetValue(const wxString& value);
+
+    // Standard event handling
+    void OnCut(wxCommandEvent& event);
+    void OnCopy(wxCommandEvent& event);
+    void OnPaste(wxCommandEvent& event);
+    void OnUndo(wxCommandEvent& event);
+    void OnRedo(wxCommandEvent& event);
+    void OnDelete(wxCommandEvent& event);
+    void OnSelectAll(wxCommandEvent& event);
+
+    void OnUpdateCut(wxUpdateUIEvent& event);
+    void OnUpdateCopy(wxUpdateUIEvent& event);
+    void OnUpdatePaste(wxUpdateUIEvent& event);
+    void OnUpdateUndo(wxUpdateUIEvent& event);
+    void OnUpdateRedo(wxUpdateUIEvent& event);
+    void OnUpdateDelete(wxUpdateUIEvent& event);
+    void OnUpdateSelectAll(wxUpdateUIEvent& event);
+
+    virtual void GTKDisableEvents();
+    virtual void GTKEnableEvents();

     GtkWidget* GetConnectWidget();
     GtkWidget* GetConnectWidget();

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();
- 
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

 protected:
 protected:

-    virtual wxSize DoGetBestSize() const;
+    // From wxWindowGTK:
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 

-private: 
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-    DECLARE_EVENT_TABLE()
-};
+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }
+
+    // Override in derived classes to create combo box widgets with
+    // custom list stores.
+    virtual void GTKCreateComboBoxWidget();

 
 

-#endif
+    virtual GtkEntry *GetEntry() const
+        { return m_entry; }

 
 

-#endif
+    GtkEntry*   m_entry;
+
+private:
+    // From wxTextEntry:
+    virtual wxWindow *GetEditableWindow() { return this; }
+    virtual GtkEditable *GetEditable() const;
+    virtual void EnableTextChangedEvents(bool enable);
+
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
+    DECLARE_EVENT_TABLE()
+};

 
 

-  // __GTKCOMBOBOXH__
+#endif // _WX_GTK_COMBOBOX_H_