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

1. wxBase compiles under BeOS

Browse Source 
2. several bugs corrected in wxTextCtrl::Load/SaveFile (wxMSW)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-12-22 21:09:32 +00:00
parent e17e2b7c1d
commit b12915c104
14 changed files with 1040 additions and 859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/msw/app.cpp
View File

@@ -151,12 +151,6 @@ HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
#if wxUSE_RICHEDIT
// the handle to richedit DLL and the version of the DLL loaded
static HINSTANCE gs_hRichEdit = (HINSTANCE)NULL;
static int gs_verRichEdit = -1;
#endif
// ===========================================================================
// implementation
// ===========================================================================
@@ -524,11 +518,6 @@ void wxApp::CleanUp()
wxSetKeyboardHook(FALSE);
#if wxUSE_RICHEDIT
if (gs_hRichEdit != (HINSTANCE) NULL)
FreeLibrary(gs_hRichEdit);
#endif
#if wxUSE_PENWINDOWS
wxCleanUpPenWin();
#endif
@@ -1111,52 +1100,6 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
}
}
#if wxUSE_RICHEDIT
/* static */
bool wxApp::InitRichEdit(int version)
{
wxCHECK_MSG( version >= 1 && version <= 3, FALSE,
_T("incorrect richedit control version requested") );
if ( version <= gs_verRichEdit )
{
// we've already got this or better
return TRUE;
}
if ( gs_hRichEdit )
{
::FreeLibrary(gs_hRichEdit);
}
// always try load riched20.dll first - like this we won't have to reload
// it later if we're first asked for RE 1 and then for RE 2 or 3
wxString dllname = _T("riched20.dll");
gs_hRichEdit = ::LoadLibrary(dllname);
if ( !gs_hRichEdit && (version == 1) )
{
// fall back to RE 1
dllname = _T("riched32.dll");
gs_hRichEdit = ::LoadLibrary(dllname);
}
if ( !gs_hRichEdit )
{
wxLogSysError(_("Could not load Rich Edit DLL '%s'"), dllname.c_str());
gs_verRichEdit = -1;
return FALSE;
}
gs_verRichEdit = version;
return TRUE;
}
#endif // wxUSE_RICHEDIT
/* static */
int wxApp::GetComCtl32Version()
{