projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxUniversal compilation fix.
[wxWidgets.git]
/
include
/
wx
/
msw
/
statbox.h
diff --git
a/include/wx/msw/statbox.h
b/include/wx/msw/statbox.h
index 2e18c72266580dfcf3f65202ff5685e36fddc5d7..decf37139d5f4157cb536226e232af7cb8d69957 100644
(file)
--- a/
include/wx/msw/statbox.h
+++ b/
include/wx/msw/statbox.h
@@
-12,7
+12,7
@@
#ifndef _WX_STATBOX_H_
#define _WX_STATBOX_H_
#ifndef _WX_STATBOX_H_
#define _WX_STATBOX_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "statbox.h"
#endif
#pragma interface "statbox.h"
#endif
@@
-42,7
+42,7
@@
public:
// implementation from now on
// --------------------------
// implementation from now on
// --------------------------
- virtual
long
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+ virtual
WXLRESULT
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
// overriden base class virtuals
virtual bool AcceptsFocus() const { return FALSE; }
@@
-51,7
+51,7
@@
protected:
virtual wxSize DoGetBestSize() const;
private:
virtual wxSize DoGetBestSize() const;
private:
- DECLARE_DYNAMIC_CLASS(wxStaticBox)
+ DECLARE_DYNAMIC_CLASS
_NO_COPY
(wxStaticBox)
};
#endif
};
#endif