Added wxDbTable::SetOrderByColNums() function

[wxWidgets.git] / demos / dbbrowse / dbtree.h

diff --git a/demos/dbbrowse/dbtree.h b/demos/dbbrowse/dbtree.h
index 61d5604385d3b4069d5c9ca171c0c2db234e1dfb..0ed916390d922fe6243ffe2d988b37244aa64652 100644 (file)
--- a/demos/dbbrowse/dbtree.h
+++ b/demos/dbbrowse/dbtree.h
@@ -1,25 +1,23 @@
-//---------------------------------------------------------------------------
-// Name:        DBTree.h
-// Purpose:     Shows ODBC Catalog entries for Databases
+//----------------------------------------------------------------------------------------
+// Name:        DBTree.cpp/.h
+// Purpose:     Tree with Table and Views, branches show Field information

 // Author:      Mark Johnson
 // Modified by: 19991129.mj10777
 // Created:     19991129
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license
 // RCS-ID:      $Id$
 // Author:      Mark Johnson
 // Modified by: 19991129.mj10777
 // Created:     19991129
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license
 // RCS-ID:      $Id$

-//---------------------------------------------------------------------------
-class mjDoc;               // Declared in Doc.h file
-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------
+class MainDoc;             // Declared in Doc.h file
+//----------------------------------------------------------------------------------------

 class DBTreeData : public wxTreeItemData
 {
 public:
  DBTreeData(const wxString& desc) : m_desc(desc) { }
 class DBTreeData : public wxTreeItemData
 {
 public:
  DBTreeData(const wxString& desc) : m_desc(desc) { }

-

  void ShowInfo(wxTreeCtrl *tree);
  void ShowInfo(wxTreeCtrl *tree);

-
-  wxString m_desc;
+ wxString m_desc;

 };
 };

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 class DBTree : public wxTreeCtrl
 {
  public:
 class DBTree : public wxTreeCtrl
 {
  public:


@@ -39,14 +37,14 @@ class DBTree : public wxTreeCtrl
    TreeIc_FolderOpen                // f_open.ico
   };
   wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;
    TreeIc_FolderOpen                // f_open.ico
   };
   wxString Temp0, Temp1, Temp2, Temp3, Temp4, Temp5;

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

   DBTree() { }
   DBTree(wxWindow *parent);
   DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size,long style);
   virtual ~DBTree();
   DBTree() { }
   DBTree(wxWindow *parent);
   DBTree(wxWindow *parent, const wxWindowID id,const wxPoint& pos, const wxSize& size,long style);
   virtual ~DBTree();

-  mjDoc *pDoc;
+  MainDoc *pDoc;

   wxDbInf *ct_BrowserDB;
   wxDbInf *ct_BrowserDB;

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

   int       i_TabArt;   // Tab = 0 ; Page = 1;
   int       i_ViewNr;   // View Nummer in Tab / Page
   int       i_Which;    // Which View, Database is this/using
   int       i_TabArt;   // Tab = 0 ; Page = 1;
   int       i_ViewNr;   // View Nummer in Tab / Page
   int       i_Which;    // Which View, Database is this/using


@@ -54,21 +52,21 @@ class DBTree : public wxTreeCtrl
   wxMenu   *popupMenu1; // OnDBClass
   wxMenu   *popupMenu2; // OnDBGrid & OnTableclass
   wxPoint TreePos;
   wxMenu   *popupMenu1; // OnDBClass
   wxMenu   *popupMenu2; // OnDBGrid & OnTableclass
   wxPoint TreePos;

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

   wxImageList *p_imageListNormal;
   wxImageList *p_imageListNormal;

-//---------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

  public:
   int  OnPopulate();
   void OnSelChanged(wxTreeEvent& event);
   void OnRightSelect(wxTreeEvent& event);
  public:
   int  OnPopulate();
   void OnSelChanged(wxTreeEvent& event);
   void OnRightSelect(wxTreeEvent& event);

-  void OnDBGrid(wxMenu& menu, wxCommandEvent& event);
-  void OnDBClass(wxMenu& menu, wxCommandEvent& event);
-  void OnTableClass(wxMenu& menu, wxCommandEvent& event);
-  void OnTableClassAll(wxMenu& menu, wxCommandEvent& event);
+  void OnDBGrid(wxCommandEvent& event);
+  void OnDBClass(wxCommandEvent& event);
+  void OnTableClass(wxCommandEvent& event);
+  void OnTableClassAll(wxCommandEvent& event);

   void OnMouseEvent(wxMouseEvent& event);
   void OnMouseMove(wxMouseEvent& event);
  public:
   void OnMouseEvent(wxMouseEvent& event);
   void OnMouseMove(wxMouseEvent& 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
   // 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


@@ -76,11 +74,11 @@ class DBTree : public wxTreeCtrl
   DECLARE_DYNAMIC_CLASS(DBTree)
   DECLARE_EVENT_TABLE()
 };
   DECLARE_DYNAMIC_CLASS(DBTree)
   DECLARE_EVENT_TABLE()
 };

-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------

 #define POPUP_01_BEGIN     1100
 #define DATA_SHOW          1101
 #define DATA_DB            1102
 #define DATA_TABLE         1103
 #define DATA_TABLE_ALL     1104
 #define POPUP_01_END       1117
 #define POPUP_01_BEGIN     1100
 #define DATA_SHOW          1101
 #define DATA_DB            1102
 #define DATA_TABLE         1103
 #define DATA_TABLE_ALL     1104
 #define POPUP_01_END       1117

-//------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------