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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index 78d0ab10fddf725c22023a8897258fea7e535cd0..f8f537e27540b782cf367fb49baec6ec6bd28195 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -194,7 +194,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
 
   // Required to force normal cursor-setting behaviour in Windows
 #ifdef __WXMSW__
 
   // Required to force normal cursor-setting behaviour in Windows
 #ifdef __WXMSW__

-  virtual void MSWOnMouseMove(int x, int y, const WXUINT flags);
+  virtual void MSWOnMouseMove(int x, int y, WXUINT flags);

 #endif
 
  protected:
 #endif
 
  protected:

diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index 79d1f9b9dfddd8d67c793ae42462b2b41d20c348..de925cc2eac3020284b105308aefc55ed408c1b2 100644 (file)
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -607,7 +607,7 @@ bool wxRecordSet::GetResultSet(void)
     curcol = cols.Append(name, col1);
     col1->SetName(name);
     col1->SetType(type);
     curcol = cols.Append(name, col1);
     col1->SetName(name);
     col1->SetType(type);

-    col1->SetNullable(nullable);
+    col1->SetNullable((nullable != 0));

 
     wxQueryField *field1 = new wxQueryField;
     fetch = fetchbuf.Append(field1);
 
     wxQueryField *field1 = new wxQueryField;
     fetch = fetchbuf.Append(field1);

diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 1eff810ba03e649943527b5fd2271b1a5fc486f3..aac6b6ae94e46e1ca96cfbe751d5201a5524e0d1 100644 (file)
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -732,7 +732,7 @@ void wxToolBarBase::DoToolbarUpdates(void)
 
 #ifdef __WXMSW__
 // Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
 
 #ifdef __WXMSW__
 // 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);
 }

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index c326c6a0da693345825142eaa67b919b4421c7a5..749f2798ea5a8d1050a35a1f8419376a1d4e4ac5 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -97,14 +97,14 @@ void wxRegConfig::SetPath(const wxString& strPath)
   if ( strPath.IsEmpty() )
     return;
 
   if ( strPath.IsEmpty() )
     return;
 

-  if ( strPath[0] == APPCONF_PATH_SEPARATOR ) {
+  if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) {

     // absolute path
     wxSplitPath(aParts, strPath);
   }
   else {
     // relative path, combine with current one
     wxString strFullPath = GetPath();
     // absolute path
     wxSplitPath(aParts, strPath);
   }
   else {
     // relative path, combine with current one
     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();
   for ( uint n = 0; n < aParts.Count(); n++ ) {
     strRegPath << '\\' << aParts[n];
   m_strPath.Empty();
   for ( uint n = 0; n < aParts.Count(); 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;
 
   if ( !m_keyLocal.HasSubkeys() ) {
     return FALSE;
 
   if ( !m_keyLocal.HasSubkeys() ) {

-    wxString strKey = GetPath().Right(APPCONF_PATH_SEPARATOR);
+    wxString strKey = GetPath().Right(wxCONFIG_PATH_SEPARATOR);

     SetPath("..");  // changes m_keyLocal
     return m_keyLocal.DeleteKey(strKey);
   }
     SetPath("..");  // changes m_keyLocal
     return m_keyLocal.DeleteKey(strKey);
   }