OnEnter/OnDragOver API update (compiles, links, somewhat runs under wxGTK)

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 393c9e886182b57ffd515194f7bfe6805b882340..b7dd865d98a4151ca9086c2c0a37b275f81248d8 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -4,92 +4,83 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// 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();
-  inline 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 );
+    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;

 
 

-  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 Clear();
-  void Delete(int n);
-  
-  int FindString( const wxString &string ) const;
-  int GetColumns() const;
-  int GetSelection();
-  wxString GetString( int n ) const;
-  wxString GetStringSelection() const;
-  int Number() const;
-  void SetColumns( int n = 1 );
-  void SetSelection( int n );
-  void SetStringSelection( const wxString &string );
-    
-// implementation
-    
-  wxList   m_clientDataList;
-  wxList   m_clientObjectList;
+    // 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()); };

 
 

-  void AppendCommon( const wxString &item );
-  void ApplyWidgetStyle();
+private:
+    DECLARE_DYNAMIC_CLASS(wxChoice)

 };
 
 };
 

+

 #endif // __GTKCHOICEH__
 #endif // __GTKCHOICEH__