Fixed a small wxDialog thing

[wxWidgets.git] / include / wx / list.h

diff --git a/include/wx/list.h b/include/wx/list.h
index 32444309a5f5811a81fe75dcc11b6c96793c5927..9f3753d37caea358330a8ca73307e2aff66902b4 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LISTH__
-#define __LISTH__
+#ifndef _WX_LISTH__
+#define _WX_LISTH__
 
 #ifdef __GNUG__
 #pragma interface "list.h"
@@ -43,7 +43,7 @@ class WXDLLEXPORT wxNode: public wxObject
     char *string;
   } key;
 
-  wxNode(wxList *the_list = NULL, wxNode *last_one = NULL, wxNode *next_one = NULL, wxObject *object = NULL);
+  wxNode(wxList *the_list = (wxList *) NULL, wxNode *last_one = (wxNode *) NULL, wxNode *next_one = (wxNode *) NULL, wxObject *object = (wxObject *) NULL);
   wxNode(wxList *the_list, wxNode *last_one, wxNode *next_one,
          wxObject *object, long the_key);
   wxNode(wxList *the_list, wxNode *last_one, wxNode *next_one,
@@ -76,11 +76,6 @@ class WXDLLEXPORT wxList: public wxObject
   wxList(int N, wxObject *Objects[]);
   wxList(wxObject *object, ...);
   
-#ifdef USE_STORABLE_CLASSES
-  wxList( istream &stream, char *data );
-  virtual void StoreObject( ostream &stream );
-#endif
-  
   ~wxList(void);
 
   inline int Number(void) const { return n; }
@@ -145,4 +140,4 @@ class WXDLLEXPORT wxStringList: public wxList
 };
 
 #endif
-    // __LISTH__
+    // _WX_LISTH__