Added wxString version of wxStripExtension; changed OnClose to return TRUE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 8de99567f5282d9916bc89bb558082e79deec81a..8a90ad439efd6b24b56bb8128e4ae479c34225b0 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -71,6 +71,7 @@ void WXDLLEXPORT wxUnix2DosFilename(char *s);
 
 // Strip the extension, in situ
 void WXDLLEXPORT wxStripExtension(char *buffer);
 
 // 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);
 
 // Get a temporary filename, opening and closing the file.
 char* WXDLLEXPORT wxGetTempFileName(const wxString& prefix, char *buf = NULL);

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 664449d5b8eb2187feedef734834c04975011306..9da07a884c7ab91866da304d54340524961f3918 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -58,6 +58,8 @@ public:
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 
   void GetPosition(int *x, int *y) const ;
   void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
 

+  virtual bool OnClose(void);
+

   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
   void OnActivate(wxActivateEvent& event);
   void OnSize(wxSizeEvent& event);
   void OnMenuHighlight(wxMenuEvent& event);
   void OnActivate(wxActivateEvent& event);