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

compilation fixes for VC++ in release mode

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-08-15 15:26:27 +00:00
parent 9cb9fdb372
commit 5716a1abb1
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/filename.cpp
View File

@@ -590,8 +590,8 @@ wxString wxFileName::GetShortPath() const
} }
if (ok) if (ok)
return pathOut; return pathOut;
else
return path; return path;
#else #else
return GetFullPath(); return GetFullPath();
#endif #endif
@@ -605,7 +605,8 @@ wxString wxFileName::GetLongPath() const
wxString pathOut; wxString pathOut;
bool success = FALSE; bool success = FALSE;
#if wxUSE_DYNLIB_CLASS // VZ: this code was disabled, why?
#if 0 // wxUSE_DYNLIB_CLASS
typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD); typedef DWORD (*GET_LONG_PATH_NAME)(const wxChar *, wxChar *, DWORD);
static bool s_triedToLoad = FALSE; static bool s_triedToLoad = FALSE;
@@ -613,7 +614,6 @@ wxString wxFileName::GetLongPath() const
if ( !s_triedToLoad ) if ( !s_triedToLoad )
{ {
s_triedToLoad = TRUE; s_triedToLoad = TRUE;
#if 0
wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32")); wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32"));
if ( dllKernel ) if ( dllKernel )
{ {
@@ -651,12 +651,10 @@ wxString wxFileName::GetLongPath() const
} }
} }
} }
#endif
} }
if (success) if (success)
return pathOut; return pathOut;
#endif #endif // wxUSE_DYNLIB_CLASS
// wxUSE_DYNLIB_CLASS
if (!success) if (!success)
{ {
@@ -705,6 +703,7 @@ wxString wxFileName::GetLongPath() const
} }
} }
} }
return pathOut; return pathOut;
#else #else
return GetFullPath(); return GetFullPath();

4
src/generic/dirctrlg.cpp
View File

@@ -1074,8 +1074,8 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin
description = descriptions[n]; description = descriptions[n];
return TRUE; return TRUE;
} }
else
return FALSE; return FALSE;
} }
// Parses the global filter, returning the number of filters. // Parses the global filter, returning the number of filters.

4
src/generic/treectlg.cpp
View File

@@ -2314,8 +2314,8 @@ wxTreeItemId wxGenericTreeCtrl::HitTest(const wxPoint& point, int& flags)
if (m_anchor) if (m_anchor)
return m_anchor->HitTest( wxPoint(x, y), this, flags); return m_anchor->HitTest( wxPoint(x, y), this, flags);
else
return wxTreeItemId(); return wxTreeItemId();
} }
// get the bounding rectangle of the item (or of its label only) // get the bounding rectangle of the item (or of its label only)

3
src/html/htmltag.cpp
View File

@@ -376,8 +376,9 @@ bool wxHtmlTag::GetParamAsColour(const wxString& par, wxColour *clr) const
HTML_COLOUR("teal", 0x00,0x80,0x80) HTML_COLOUR("teal", 0x00,0x80,0x80)
HTML_COLOUR("aqua", 0x00,0xFF,0xFF) HTML_COLOUR("aqua", 0x00,0xFF,0xFF)
#undef HTML_COLOUR #undef HTML_COLOUR
return FALSE;
} }
return FALSE;
} }
bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const bool wxHtmlTag::GetParamAsInt(const wxString& par, int *clr) const