X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/278c927dd9d163dd67d90cd5e01e77fecfcbac91..4c68a10264347cc04b1a6634000595f160792231:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index b06b0fa46f..03cb30b657 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TBAR95_H_
 #define _WX_TBAR95_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "tbar95.h"
 #endif
 
@@ -101,7 +101,7 @@ protected:
     virtual wxToolBarToolBase *CreateTool(wxControl *control);
 
     // override WndProc mainly to process WM_SIZE
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     // return the appropriate size and flags for the toolbar control
     virtual wxSize DoGetBestSize() const;