warning for 2.5.3

[wxWidgets.git] / include / wx / mac / carbon / combobox.h

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 400029d0ec984246e530b20b93162e75f8efac29..774d7a13f4417737ad6a5d5df999e07a9116f1a4 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_


@@ -21,6 +21,11 @@
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 
 
 WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;
 

+// forward declaration of private implementation classes
+
+class wxComboBoxText ;
+class wxComboBoxChoice ;
+

 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 {
 // Combobox item
 class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
 {


@@ -128,8 +133,8 @@ protected:
     void FreeData();
 
     // the subcontrols
     void FreeData();
 
     // the subcontrols

-    wxTextCtrl*     m_text;
-    wxChoice*       m_choice;
+    wxComboBoxText*     m_text;
+    wxComboBoxChoice*   m_choice;

 };
 
 #endif
 };
 
 #endif