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

96
demos/dbbrowse/pgmctrl.h
View File

@@ -7,62 +7,66 @@
// RCS-ID: $Id$
// Copyright: (c) Mark Johnson, Berlin Germany, mj10777@gmx.net
// Licence: wxWindows license
//----------------------------------------------------------------------------------------
class MainDoc; // Declared in doc.h file
//----------------------------------------------------------------------------------------
class TreeData : public wxTreeItemData
{
public:
TreeData(const wxString& desc) : m_desc(desc) { }
void ShowInfo(wxTreeCtrl *tree);
wxString m_desc;
public:
TreeData(const wxString& desc) : m_desc(desc) { }
void ShowInfo(wxTreeCtrl *tree);
wxString m_desc;
};
//----------------------------------------------------------------------------------------
class PgmCtrl : public wxTreeCtrl
{
public:
enum
{ // The order here must be the same as in m_imageListNormal !
TreeIc_Logo, // logo.ico
TreeIc_DsnClosed, // dsnclose.ico
TreeIc_DsnOpen, // dsnopen.ico
TreeIc_DocClosed, // d_closed.ico
TreeIc_DocOpen, // d_open.ico
TreeIc_FolderClosed, // f_closed.ico
TreeIc_FolderOpen // f_open.ico
};
wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
//----------------------------------------------------------------------------------------
PgmCtrl() { }
PgmCtrl(wxWindow *parent);
PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size,long style);
virtual ~PgmCtrl();
MainDoc *pDoc;
//----------------------------------------------------------------------------------------
int i_TabArt; // Tab = 0 ; Page = 1;
int i_ViewNr; // View Nummer in Tab / Page
//----------------------------------------------------------------------------------------
wxImageList *p_imageListNormal;
wxMenu *popupMenu1; // OnDBClass
wxPoint TreePos;
wxString SaveDSN; // Needed for User and Password
//----------------------------------------------------------------------------------------
public:
int OnPopulate();
void OnSelChanged(wxMouseEvent& event);
void OnRightSelect(wxTreeEvent& event);
void OnMouseMove(wxMouseEvent& event);
void OnUserPassword(wxCommandEvent& event);
public:
//----------------------------------------------------------------------------------------
// NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
// if you want your overloaded OnCompareItems() to be called.
// OTOH, if you don't want it you may omit the next line - this will
// make default (alphabetical) sorting much faster under wxMSW.
DECLARE_DYNAMIC_CLASS(PgmCtrl)
DECLARE_EVENT_TABLE()
public:
enum
{ // The order here must be the same as in m_imageListNormal !
TreeIc_Logo, // logo.ico
TreeIc_DsnClosed, // dsnclose.ico
TreeIc_DsnOpen, // dsnopen.ico
TreeIc_DocClosed, // d_closed.ico
TreeIc_DocOpen, // d_open.ico
TreeIc_FolderClosed, // f_closed.ico
TreeIc_FolderOpen // f_open.ico
};
wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
//----------------------------------------------------------------------------------------
PgmCtrl() { }
PgmCtrl(wxWindow *parent);
PgmCtrl(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size,long style);
virtual ~PgmCtrl();
MainDoc *pDoc;
//----------------------------------------------------------------------------------------
int i_TabArt; // Tab = 0 ; Page = 1;
int i_ViewNr; // View Nummer in Tab / Page
//----------------------------------------------------------------------------------------
wxImageList *p_imageListNormal;
wxMenu *popupMenu1; // OnDBClass
wxPoint TreePos;
wxString SaveDSN; // Needed for User and Password
//----------------------------------------------------------------------------------------
public:
int OnPopulate();
void OnSelChanged(wxMouseEvent& event);
void OnRightSelect(wxTreeEvent& event);
void OnMouseMove(wxMouseEvent& event);
void OnUserPassword(wxCommandEvent& event);
public:
//----------------------------------------------------------------------------------------
// NB: due to an ugly wxMSW hack you _must_ use DECLARE_DYNAMIC_CLASS()
// if you want your overloaded OnCompareItems() to be called.
// OTOH, if you don't want it you may omit the next line - this will
// make default (alphabetical) sorting much faster under wxMSW.
DECLARE_DYNAMIC_CLASS(PgmCtrl)
DECLARE_EVENT_TABLE()
};
//----------------------------------------------------------------------------------------
#define PGMCTRL_01_BEGIN 1000
#define PGMCTRL_ODBC_USER 1001