AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1. fixed compilation of wxExecute() for !wxUSE_IPC

Browse Source 
2. wxLogStatus() will not assert if there is no statusbar to set text for


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-18 21:21:33 +00:00
parent feda301187
commit 731dd422ea
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/logg.cpp
View File

@ -198,7 +198,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
} }
} }
if ( pFrame != NULL ) if ( pFrame && pFrame->GetStatusBar() )
pFrame->SetStatusText(szString); pFrame->SetStatusText(szString);
} }
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR

10
src/msw/utilsexc.cpp
View File

@ -74,7 +74,9 @@
#endif #endif
#include <stdarg.h> #include <stdarg.h>
#include "wx/dde.h" // for WX_DDE hack in wxExecute #if wxUSE_IPC
#include "wx/dde.h" // for WX_DDE hack in wxExecute
#endif // wxUSE_IPC
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
@ -177,12 +179,13 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
return DefWindowProc(hWnd, message, wParam, lParam); return DefWindowProc(hWnd, message, wParam, lParam);
} }
} }
#endif #endif // Win32
long wxExecute(const wxString& cmd, bool sync, wxProcess *handler) long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
{ {
wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") ); wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
#if wxUSE_IPC
// DDE hack: this is really not pretty, but we need to allow this for // DDE hack: this is really not pretty, but we need to allow this for
// transparent handling of DDE servers in wxMimeTypesManager. Usually it // transparent handling of DDE servers in wxMimeTypesManager. Usually it
// returns the command which should be run to view/open/... a file of the // returns the command which should be run to view/open/... a file of the
@ -247,6 +250,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
} }
} }
else else
#endif // wxUSE_IPC
{ {
// no DDE // no DDE
command = cmd; command = cmd;
@ -410,6 +414,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
return pi.dwProcessId; return pi.dwProcessId;
} }
#if wxUSE_IPC
// second part of DDE hack: now establish the DDE conversation with the // second part of DDE hack: now establish the DDE conversation with the
// just launched process // just launched process
if ( !!ddeServer ) if ( !!ddeServer )
@ -423,6 +428,7 @@ long wxExecute(const wxString& cmd, bool sync, wxProcess *handler)
wxLogError(_("Couldn't launch DDE server '%s'."), command.c_str()); wxLogError(_("Couldn't launch DDE server '%s'."), command.c_str());
} }
} }
#endif // wxUSE_IPC
if ( !sync ) if ( !sync )
{ {