added ClassRegistrar (wraps Register/UnregisterClass Win32 API calls)

[wxWidgets.git] / include / wx / msw / tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index b06b0fa46f60b748cce78f182e5eea0f609087ad..03cb30b65769e940fea1881c6a006e2241edf106 100644 (file)
--- 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;