Various compiler changes

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

diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h
index 39e7cc48c02c16e637782cbb1f45aed3ad4c4009..9335dddcd63f75ee51a80c6545c90a099388dd8d 100644 (file)
--- a/demos/dbbrowse/dbgrid.h
+++ b/demos/dbbrowse/dbgrid.h
@@ -12,7 +12,7 @@
  #error "DBGrid requires the new wxGrid class"
 #endif
 //----------------------------------------------------------------------------------------
-class mjDoc;
+class MainDoc;
 //----------------------------------------------------------------------------------------
 class DBGrid: public wxGrid
 {
@@ -24,7 +24,7 @@ class DBGrid: public wxGrid
   int        i_ViewNr;   // View Nummer in Tab / Page
   int        i_Which;    // Which View, Database is this/using
  //---------------------------------------------------------------------------------------
-  mjDoc*     pDoc;
+  MainDoc*   pDoc;
   wxDbInf*   ct_BrowserDB;
   BrowserDB* db_Br;
   wxMenu   *popupMenu1; // OnDBClass
@@ -34,22 +34,26 @@ class DBGrid: public wxGrid
   wxString logBuf,Temp0;
   wxPoint  MousePos;
  //---------------------------------------------------------------------------------------
- void OnModusEdit(wxMenu& menu, wxCommandEvent& event);
- void OnModusBrowse(wxMenu& menu, wxCommandEvent& event);
+ void OnModusEdit(wxCommandEvent& event);
+ void OnModusBrowse(wxCommandEvent& event);
  void OnMouseMove(wxMouseEvent& event);
  int  OnTableView(wxString Table);
- void OnLabelLeftClick( wxGridEvent& );
- void OnLabelRightClick( wxGridEvent& );
- void OnLabelLeftDClick( wxGridEvent& );
- void OnLabelRightDClick( wxGridEvent& );
+ //-----
+ void OnCellChange( wxGridEvent& );
  void OnCellLeftClick( wxGridEvent& );
- void OnCellRightClick( wxGridEvent& );
  void OnCellLeftDClick( wxGridEvent& );
+ void OnCellRightClick( wxGridEvent& );
  void OnCellRightDClick( wxGridEvent& );
- void OnRowSize( wxGridSizeEvent& );
  void OnColSize( wxGridSizeEvent& );
+ void OnEditorShown( wxGridEvent& );
+ void OnEditorHidden( wxGridEvent& );
+ void OnLabelLeftClick( wxGridEvent& );
+ void OnLabelLeftDClick( wxGridEvent& );
+ void OnLabelRightClick( wxGridEvent& );
+ void OnLabelRightDClick( wxGridEvent& );
  void OnRangeSelected( wxGridRangeSelectEvent& );
- void OnCellChange( wxGridEvent& );
+ void OnRowSize( wxGridSizeEvent& );
+ void OnSelectCell( wxGridEvent& );
  //---------------------------------------------------------------------------------------
  DECLARE_EVENT_TABLE()
 };