Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to make digitalmars link - I really don't like the extern C declarations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-04-19 19:25:28 +00:00
parent 4ce1efe123
commit cc972ac67e
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/app.cpp
View File

@@ -151,7 +151,11 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;
HBRUSH wxDisableButtonBrush = (HBRUSH) 0; HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
#ifdef __DIGITALMARS__
extern "C" LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
#else
LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
#endif
// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it // FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it
// needs compiler support for Win32 SEH. Others (especially Borland) // needs compiler support for Win32 SEH. Others (especially Borland)

4
src/msw/utils.cpp
View File

@@ -1319,7 +1319,11 @@ static HCURSOR gs_wxBusyCursor = 0; // new, busy cursor
static HCURSOR gs_wxBusyCursorOld = 0; // old cursor static HCURSOR gs_wxBusyCursorOld = 0; // old cursor
static int gs_wxBusyCursorCount = 0; static int gs_wxBusyCursorCount = 0;
#ifdef __DIGITALMARS__
extern "C" HCURSOR wxGetCurrentBusyCursor()
#else
extern HCURSOR wxGetCurrentBusyCursor() extern HCURSOR wxGetCurrentBusyCursor()
#endif
{ {
return gs_wxBusyCursor; return gs_wxBusyCursor;
} }

17
src/msw/window.cpp
View File

@@ -170,15 +170,25 @@ static bool gs_hasStdCmap = FALSE;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// the window proc for all our windows // the window proc for all our windows
#ifdef __DIGITALMARS__
extern "C" LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
#else
LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam); WPARAM wParam, LPARAM lParam);
#endif
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
const char *wxGetMessageName(int message); const char *wxGetMessageName(int message);
#endif //__WXDEBUG__ #endif //__WXDEBUG__
void wxRemoveHandleAssociation(wxWindowMSW *win); void wxRemoveHandleAssociation(wxWindowMSW *win);
void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win); #ifdef __DIGITALMARS__
extern "C" void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win);
#else
extern void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win);
#endif
wxWindow *wxFindWinFromHandle(WXHWND hWnd); wxWindow *wxFindWinFromHandle(WXHWND hWnd);
// this magical function is used to translate VK_APPS key presses to right // this magical function is used to translate VK_APPS key presses to right
@@ -3310,6 +3320,7 @@ bool wxWindowMSW::HandleDestroy()
// delete our drop target if we've got one // delete our drop target if we've got one
#if wxUSE_DRAG_AND_DROP #if wxUSE_DRAG_AND_DROP
if ( m_dropTarget != NULL ) if ( m_dropTarget != NULL )
{ {
m_dropTarget->Revoke(m_hWnd); m_dropTarget->Revoke(m_hWnd);
@@ -3471,6 +3482,10 @@ bool wxWindowMSW::HandleDropFiles(WXWPARAM wParam)
#endif #endif
} }
#ifdef __DIGITALMARS__
extern "C" HCURSOR wxGetCurrentBusyCursor();
#endif
bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd), bool wxWindowMSW::HandleSetCursor(WXHWND WXUNUSED(hWnd),
short nHitTest, short nHitTest,
int WXUNUSED(mouseMsg)) int WXUNUSED(mouseMsg))