wxClipboard::IsOpened() and wxCLipboardLocker helper class added

[wxWidgets.git] / include / wx / gtk1 / choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index b3feb2c065035aa9e42cc03a0508b13cb52a3fd8..b7dd865d98a4151ca9086c2c0a37b275f81248d8 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -2,67 +2,85 @@
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        choice.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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

-

 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifdef __GNUG__
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifdef __GNUG__

-#pragma interface
+    #pragma interface "choice.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// classes
+// wxChoice

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-class wxChoice;
+class wxChoice : public wxChoiceBase
+{
+public:
+    wxChoice();
+    wxChoice( wxWindow *parent, wxWindowID id,
+            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 = wxChoiceNameStr )
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    ~wxChoice();
+    bool Create( wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            int n = 0, const wxString choices[] = (wxString *) NULL,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxChoiceNameStr );

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    // implement base class pure virtuals
+    void Delete(int n);
+    void Clear();

 
 

-extern const char *wxChoiceNameStr;
+    int GetSelection() const;
+    void SetSelection( int n );

 
 

-//-----------------------------------------------------------------------------
-// wxChoice
-//-----------------------------------------------------------------------------
+    virtual int GetCount() const;
+    int FindString( const wxString &string ) const;
+    wxString GetString( int n ) const;

 
 

-class wxChoice: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxChoice)
+    // implementation
+    wxList   m_clientList;

 
 

-  public:
+    void DisableEvents();
+    void EnableEvents();
+    void AppendCommon( const wxString &item );
+    void ApplyWidgetStyle();
+    
+protected:
+    virtual int DoAppend(const wxString& item);

 
 

-    wxChoice(void);
-    wxChoice( wxWindow *parent, const wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int n = 0, const wxString choices[] = NULL,
-      const long style = 0, const wxString &name = wxChoiceNameStr );
-    bool Create( wxWindow *parent, const wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const int n = 0, const wxString choices[] = NULL,
-      const long style = 0, const wxString &name = wxChoiceNameStr );
-    void Append( const wxString &item );
-    void Clear(void);
-    int FindString( const wxString &string ) const;
-    int GetColumns(void) const;
-    int GetSelection(void);
-    wxString GetString( const int n ) const;
-    wxString GetStringSelection(void) const;
-    int Number(void) const;
-    void SetColumns( const int n = 1 );
-    void SetSelection( const int n );
-    void SetStringSelection( const wxString &string );
+    virtual void DoSetClientData( int n, void* clientData );
+    virtual void* DoGetClientData( int n ) const;
+    virtual void DoSetClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetClientObject( int n ) const;
+
+    // the above virtuals hide these virtuals in wxChoiceBase
+    virtual void DoSetClientData(void* clientData )
+        { wxWindowBase::DoSetClientData(clientData); };
+    virtual void* DoGetClientData() const
+        { return(wxWindowBase::DoGetClientData()); };
+    virtual void DoSetClientObject( wxClientData* clientData )
+        { wxWindowBase::DoSetClientObject(clientData); };
+    virtual wxClientData* DoGetClientObject() const
+        { return(wxWindowBase::DoGetClientObject()); };
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxChoice)

 };
 
 };
 

+

 #endif // __GTKCHOICEH__
 #endif // __GTKCHOICEH__