Fixes so joystick not only compiles on Linux, but it actually works too!

[wxWidgets.git] / demos / dbbrowse / doc.cpp

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index ab3b9a73a544029625e155828b77bf55baf9fe46..a9ccf11ac87684c48db8687f559f0ed93256eeec 100644 (file)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -114,6 +114,7 @@ bool MainDoc::OnInitView()
     p_TabArea->AddTab(p_PgmCtrl,_T("PgmCtrl"),p_FolderClose);
     delete p_FolderClose;      // Memory leak
     p_FolderClose = NULL;
     p_TabArea->AddTab(p_PgmCtrl,_T("PgmCtrl"),p_FolderClose);
     delete p_FolderClose;      // Memory leak
     p_FolderClose = NULL;

+    wxUnusedVar(p_FolderClose);

     //---------------------------------------------------------------------------------------
     // now create "output" window
     //---------------------------------------------------------------------------------------
     //---------------------------------------------------------------------------------------
     // now create "output" window
     //---------------------------------------------------------------------------------------


@@ -156,7 +157,7 @@ bool MainDoc::OnInitODBC()
     wxChar DsDesc[255]; // BJO20002501 instead of 512
     Temp0 = _T("");
     i_DSN = 0;       // Counter
     wxChar DsDesc[255]; // BJO20002501 instead of 512
     Temp0 = _T("");
     i_DSN = 0;       // Counter

-    int i = 0;
+    int i;

     //---------------------------------------------------------------------------------------
     // Initialize the ODBC Environment for Database Operations
 
     //---------------------------------------------------------------------------------------
     // Initialize the ODBC Environment for Database Operations
 


@@ -200,7 +201,6 @@ bool MainDoc::OnInitODBC()
         Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
         wxLogMessage(Temp0);
     }
         Temp0.Printf(_T("%02d) Dsn(%s) DsDesc(%s)"),i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());
         wxLogMessage(Temp0);
     }

-    i = 0;

     //---------------------------------------------------------------------------------------
     // Allocate n wxDatabase objects to hold the column information
     db_Br = new BrowserDB[i_DSN];
     //---------------------------------------------------------------------------------------
     // Allocate n wxDatabase objects to hold the column information
     db_Br = new BrowserDB[i_DSN];