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

Huge cleanup of the code. Reformatting, spelling fixes, standardizing on wxWindows conventions, etc.

Browse Source 
Changed the couple lines of code required to work with checkins of the new ODBC classes that use wxStrings.
Fixed a ton of memory leaks
Demo still crashes on exit though - this problem has exited for nearly a year though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-02-01 20:24:44 +00:00
parent 4fdae9972d
commit 645889ad25
17 changed files with 3157 additions and 2979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
demos/dbbrowse/doc.h
View File

@@ -1,5 +1,5 @@
//--------------------------------------------------------------------------------------------------
// Name: Doc.h
// Name: doc.h
// Purpose: a non-MFC Document (a do-it-yourself document)
// Author: Mark Johnson, mj10777@gmx.net
// Modified by: 19990808.mj10777
@@ -7,80 +7,87 @@
// Copyright: (c) Mark Johnson
// Licence: wxWindows license
// RCS-ID: $Id$
//----------------------------------------------------------------------------------------
//-- Some Global Vars --------------------------------------------------------------------
//----------------------------------------------------------------------------------------
class DSN
{
public:
wxString Dsn;
wxString Drv;
wxString Pas;
wxString Usr;
public:
wxString Dsn;
wxString Drv;
wxString Pas;
wxString Usr;
};
//----------------------------------------------------------------------------------------
// Global structure for holding ODBC connection information
// Global structure for holding ODBC connection information
extern wxDbConnectInf DbConnectInf;
//----------------------------------------------------------------------------------------
extern wxConfigBase *p_ProgramCfg; // All Config and Path information
extern wxLogTextCtrl *p_LogBook; // All Log messages
extern wxString LogBuf; // String for all Logs
//----------------------------------------------------------------------------------------
class PgmCtrl; // Declared in PgmCtrl.h file
class DocSplitterWindow; // Declared at the end of the file
//----------------------------------------------------------------------------------------
class MainDoc
{
public:
//---------------------------------------------------------------------------------------
MainDoc();
virtual ~MainDoc();
int Sash;
//---------------------------------------------------------------------------------------
//-- declare document Vars here ---------------------------------------------------------
//---------------------------------------------------------------------------------------
wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
BrowserDB *db_Br; // Pointer to wxDB
DSN *p_DSN;
int i_DSN; // Counter
wxString s_BColour;
wxFont *ft_Doc;
//---------------------------------------------------------------------------------------
DocSplitterWindow *p_Splitter;
wxHtmlHelpController *p_Help;
wxFrame *p_MainFrame; // SDI Version
PgmCtrl *p_PgmCtrl;
DBTree *p_DBTree;
DBGrid *p_DBGrid;
wxTextCtrl *p_LogWin;
wxTabbedWindow *p_TabArea;
wxPaggedWindow *p_PageArea;
int i_TabNr; // Amount of active Views in Tab
int i_PageNr; // Amount of active Views in Page
//---------------------------------------------------------------------------------------
//-- declare document Functions here ----------------------------------------------------
//---------------------------------------------------------------------------------------
bool OnNewDocument();
bool OnInitView();
bool OnInitODBC();
bool OnChosenDSN(int Which);
bool OnChosenTbl(int Tab,wxString Table);
//---------------------------------------------------------------------------------------
void OnLeer(wxString Aufrufer); // Dummy Funktion
//---------------------------------------------------------------------------------------
public:
//---------------------------------------------------------------------------------------
MainDoc();
virtual ~MainDoc();
int Sash;
//---------------------------------------------------------------------------------------
//-- declare document Vars here ---------------------------------------------------------
//---------------------------------------------------------------------------------------
wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
BrowserDB *db_Br; // Pointer to wxDB
DSN *p_DSN;
int i_DSN; // Counter
wxString s_BColour;
wxFont *ft_Doc;
//---------------------------------------------------------------------------------------
DocSplitterWindow *p_Splitter;
wxHtmlHelpController *p_Help;
wxFrame *p_MainFrame; // SDI Version
PgmCtrl *p_PgmCtrl;
DBTree *p_DBTree;
DBGrid *p_DBGrid;
wxTextCtrl *p_LogWin;
wxTabbedWindow *p_TabArea;
wxPagedWindow *p_PageArea;
int i_TabNr; // Amount of active Views in Tab
int i_PageNr; // Amount of active Views in Page
//---------------------------------------------------------------------------------------
//-- declare document Functions here ----------------------------------------------------
//---------------------------------------------------------------------------------------
bool OnNewDocument();
bool OnInitView();
bool OnInitODBC();
bool OnChosenDSN(int Which);
bool OnChosenTbl(int Tab,wxString Table);
//---------------------------------------------------------------------------------------
void OnLeer(wxString Aufrufer); // Dummy Funktion
//---------------------------------------------------------------------------------------
};
//----------------------------------------------------------------------------------------
class DocSplitterWindow: public wxSplitterWindow
{
public:
MainDoc *pDoc;
DocSplitterWindow(wxWindow *parent, wxWindowID id);
virtual bool OnSashPositionChange(int newSashPosition)
{
if ( !wxSplitterWindow::OnSashPositionChange(newSashPosition) )
return FALSE;
pDoc->Sash = newSashPosition;
return TRUE;
}
DECLARE_EVENT_TABLE()
public:
MainDoc *pDoc;
DocSplitterWindow(wxWindow *parent, wxWindowID id);
virtual bool OnSashPositionChange(int newSashPosition)
{
if ( !wxSplitterWindow::OnSashPositionChange(newSashPosition) )
return FALSE;
pDoc->Sash = newSashPosition;
return TRUE;
}
DECLARE_EVENT_TABLE()
};
//----------------------------------------------------------------------------------------