Watcom C++ fixup in tbar95.cpp; removed WXWIN_COMPATIBILITY for 'old' menu

constructor and event handling; added wxString version of wxGetTempFileName


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

include/wx/filefn.h

@@ -98,9 +98,11 @@ WXDLLEXPORT void wxStripExtension(wxString& buffer);
 
 // Get a temporary filename, opening and closing the file.
 WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
+WXDLLEXPORT bool wxGetTempFileName(const wxString& prefix, wxString& buf);
 
 // Expand file name (~/ and ${OPENWINHOME}/ stuff)
 WXDLLEXPORT wxChar* wxExpandPath(wxChar *dest, const wxChar *path);
+WXDLLEXPORT bool wxExpandPath(wxString& dest, const wxChar *path);
 
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home

include/wx/gtk/menu.h

@@ -77,13 +77,11 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
-#if WXWIN_COMPATIBILITY
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
         Callback(func);
     }
-#endif // WXWIN_COMPATIBILITY
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;

include/wx/gtk1/menu.h

@@ -77,13 +77,11 @@ public:
 
     // TODO: virtual void SetTitle(const wxString& title);
 
-#if WXWIN_COMPATIBILITY
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
         Callback(func);
     }
-#endif // WXWIN_COMPATIBILITY
 
     // implementation
     int FindMenuIdByMenuItem( GtkWidget *menuItem ) const;

include/wx/menu.h

@@ -175,12 +175,12 @@ public:
         { return FindItem(itemId, itemMenu); }
 
     wxList& GetItems() const { return (wxList &)m_items; }
+#endif // WXWIN_COMPATIBILITY
 
     // wxWin 1.6x compatible menu event handling
     wxFunction GetCallback() const { return m_callback; }
     void Callback(const wxFunction func) { m_callback = func; }
     wxFunction m_callback;
-#endif // WXWIN_COMPATIBILITY
 
     // unlike FindItem(), this function doesn't recurse but only looks through
     // our direct children and also may return the index of the found child if

include/wx/motif/menu.h

@@ -47,13 +47,11 @@ public:
 
     bool ProcessCommand(wxCommandEvent& event);
 
-#if WXWIN_COMPATIBILITY
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
         Callback(func);
     }
-#endif // WXWIN_COMPATIBILITY
 
     //// Motif-specific
     WXWidget GetButtonWidget() const { return m_buttonWidget; }

include/wx/msw/menu.h

@@ -52,13 +52,11 @@ public:
     // MSW-specific
     bool ProcessCommand(wxCommandEvent& event);
 
-#if WXWIN_COMPATIBILITY
     wxMenu(const wxString& title, const wxFunction func)
         : wxMenuBase(title)
     {
         Callback(func);
     }
-#endif // WXWIN_COMPATIBILITY
 
     // implementation only from now on
     // -------------------------------