projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commdlg.lib is not in evc3
[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_
#ifndef _WX_TBAR95_H_
#define _WX_TBAR95_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "tbar95.h"
#endif
#pragma interface "tbar95.h"
#endif
@@
-101,7
+101,7
@@
protected:
virtual wxToolBarToolBase *CreateTool(wxControl *control);
// override WndProc mainly to process WM_SIZE
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;
// return the appropriate size and flags for the toolbar control
virtual wxSize DoGetBestSize() const;