Added WXHTREEITEM

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index a8df09a9abd4ae93337336464acc14f0bd16f72c..c7c5b3ff7f9af2061c53c3037e50ce59736cf5bf 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __FILEFNH__
-#define   __FILEFNH__
+#ifndef   _FILEFN_H_
+#define   _FILEFN_H_
 
 #ifdef __GNUG__
 #pragma interface "filefn.h"
@@ -73,9 +73,10 @@ void WXDLLEXPORT wxUnix2DosFilename(char *s);
 
 // Strip the extension, in situ
 void WXDLLEXPORT wxStripExtension(char *buffer);
+void WXDLLEXPORT wxStripExtension(wxString& buffer);
 
 // Get a temporary filename, opening and closing the file.
-char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = NULL);
+char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = (char *) NULL);
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
 char* WXDLLEXPORT wxExpandPath(char *dest, const char *path);
@@ -124,7 +125,7 @@ bool WXDLLEXPORT wxRenameFile(const wxString& file1, const wxString& file2);
 // copies into buf.
 // IMPORTANT NOTE getcwd is know not to work under some releases
 // of Win32s 1.3, according to MS release notes!
-char* WXDLLEXPORT wxGetWorkingDirectory(char *buf = NULL, int sz = 1000);
+char* WXDLLEXPORT wxGetWorkingDirectory(char *buf = (char *) NULL, int sz = 1000);
 
 // Set working directory
 bool WXDLLEXPORT wxSetWorkingDirectory(const wxString& d);
@@ -203,5 +204,5 @@ class WXDLLEXPORT wxPathList: public wxStringList
 };
 
 #endif
-  // __FILEFNH__
+  // _WX_FILEFN_H_