1. minor fixes in wxDynLib
2. added more symbols to winundef.h 3. fixed wxTextFile::IsOpen() - now it does what you'd suppose 4. listctrl now updates the item image when it changes 5. file dlg checks for an error and gives a message about it (debug only) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,7 +16,14 @@
|
||||
#define _WX_WINUNDEF_H_
|
||||
*/
|
||||
|
||||
// windows.h #defines the following identifiers which are also used in wxWin
|
||||
// ----------------------------------------------------------------------------
|
||||
// windows.h #defines the following identifiers which are also used in wxWin so
|
||||
// we replace these symbols with the corresponding inline functions and
|
||||
// undefine the macro.
|
||||
//
|
||||
// This looks quite ugly here but allows us to write clear (and correct!) code
|
||||
// elsewhere because the functions, unlike the macros, respect the scope.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// GetCharWidth
|
||||
|
||||
@@ -152,6 +159,7 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
// GetMessage
|
||||
|
||||
#ifdef GetMessage
|
||||
#undef GetMessage
|
||||
@@ -165,6 +173,20 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
// LoadLibrary
|
||||
|
||||
#ifdef LoadLibrary
|
||||
#undef LoadLibrary
|
||||
inline HINSTANCE LoadLibrary(LPCTSTR lpLibFileName)
|
||||
{
|
||||
#ifdef _UNICODE
|
||||
return LoadLibraryW(lpLibFileName);
|
||||
#else
|
||||
return LoadLibraryA(lpLibFileName);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
// For WINE
|
||||
|
||||
#if defined(GetWindowStyle) || defined(__WXWINE__)
|
||||
|
Reference in New Issue
Block a user