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

MSWOnMouseMove arg bug in toolbar; compile bug in regconf; fixed warning in odbc.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-07-30 09:37:26 +00:00
parent d4c99d6fa8
commit 4d0c0756e1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/tbarbase.h
View File

@@ -194,7 +194,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
// Required to force normal cursor-setting behaviour in Windows // Required to force normal cursor-setting behaviour in Windows
#ifdef __WXMSW__ #ifdef __WXMSW__
virtual void MSWOnMouseMove(int x, int y, const WXUINT flags); virtual void MSWOnMouseMove(int x, int y, WXUINT flags);
#endif #endif
protected: protected:

2
src/common/odbc.cpp
View File

@@ -607,7 +607,7 @@ bool wxRecordSet::GetResultSet(void)
curcol = cols.Append(name, col1); curcol = cols.Append(name, col1);
col1->SetName(name); col1->SetName(name);
col1->SetType(type); col1->SetType(type);
col1->SetNullable(nullable); col1->SetNullable((nullable != 0));
wxQueryField *field1 = new wxQueryField; wxQueryField *field1 = new wxQueryField;
fetch = fetchbuf.Append(field1); fetch = fetchbuf.Append(field1);

2
src/common/tbarbase.cpp
View File

@@ -732,7 +732,7 @@ void wxToolBarBase::DoToolbarUpdates(void)
#ifdef __WXMSW__ #ifdef __WXMSW__
// Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor. // Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags) void wxToolBarBase::MSWOnMouseMove(int x, int y, WXUINT flags)
{ {
wxWindow::MSWOnMouseMove(x, y, flags); wxWindow::MSWOnMouseMove(x, y, flags);
} }

8
src/msw/regconf.cpp
View File

@@ -97,14 +97,14 @@ void wxRegConfig::SetPath(const wxString& strPath)
if ( strPath.IsEmpty() ) if ( strPath.IsEmpty() )
return; return;
if ( strPath[0] == APPCONF_PATH_SEPARATOR ) { if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {
// absolute path // absolute path
wxSplitPath(aParts, strPath); wxSplitPath(aParts, strPath);
} }
else { else {
// relative path, combine with current one // relative path, combine with current one
wxString strFullPath = GetPath(); wxString strFullPath = GetPath();
strFullPath << APPCONF_PATH_SEPARATOR << strPath; strFullPath << wxCONFIG_PATH_SEPARATOR << strPath;
wxSplitPath(aParts, strFullPath); wxSplitPath(aParts, strFullPath);
} }
@@ -113,7 +113,7 @@ void wxRegConfig::SetPath(const wxString& strPath)
m_strPath.Empty(); m_strPath.Empty();
for ( uint n = 0; n < aParts.Count(); n++ ) { for ( uint n = 0; n < aParts.Count(); n++ ) {
strRegPath << '\\' << aParts[n]; strRegPath << '\\' << aParts[n];
m_strPath << APPCONF_PATH_SEPARATOR << aParts[n]; m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n];
} }
// change current key(s) // change current key(s)
@@ -355,7 +355,7 @@ bool wxRegConfig::DeleteEntry(const char *szValue, bool bGroupIfEmptyAlso)
return FALSE; return FALSE;
if ( !m_keyLocal.HasSubkeys() ) { if ( !m_keyLocal.HasSubkeys() ) {
wxString strKey = GetPath().Right(APPCONF_PATH_SEPARATOR); wxString strKey = GetPath().Right(wxCONFIG_PATH_SEPARATOR);
SetPath(".."); // changes m_keyLocal SetPath(".."); // changes m_keyLocal
return m_keyLocal.DeleteKey(strKey); return m_keyLocal.DeleteKey(strKey);
} }