need wxUSE_WCHAR_T around wxConvLocal

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

diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h
index 39e7cc48c02c16e637782cbb1f45aed3ad4c4009..1037a81b5579a60e17d6ea4da5e89f8429be4719 100644 (file)
--- a/demos/dbbrowse/dbgrid.h
+++ b/demos/dbbrowse/dbgrid.h
@@ -9,53 +9,61 @@
 // RCS-ID:      $Id$
 //----------------------------------------------------------------------------------------
 #if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
 // RCS-ID:      $Id$
 //----------------------------------------------------------------------------------------
 #if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)

- #error "DBGrid requires the new wxGrid class"
+#error "DBGrid requires the new wxGrid class"

 #endif
 #endif

+

 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-class mjDoc;
+class MainDoc;
+

 //----------------------------------------------------------------------------------------
 class DBGrid: public wxGrid
 {
 //----------------------------------------------------------------------------------------
 class DBGrid: public wxGrid
 {

- public:
-  DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wxSize& size, long style);
-  virtual ~DBGrid();
- //---------------------------------------------------------------------------------------
-  int        i_TabArt;   // Tab = 0 ; Page = 1;
-  int        i_ViewNr;   // View Nummer in Tab / Page
-  int        i_Which;    // Which View, Database is this/using
- //---------------------------------------------------------------------------------------
-  mjDoc*     pDoc;
-  wxDbInf*   ct_BrowserDB;
-  BrowserDB* db_Br;
-  wxMenu   *popupMenu1; // OnDBClass
-  wxMenu   *popupMenu2; // OnDBGrid & OnTableclass
-  bool     b_EditModus;
- //---------------------------------------------------------------------------------------
-  wxString logBuf,Temp0;
-  wxPoint  MousePos;
- //---------------------------------------------------------------------------------------
- void OnModusEdit(wxMenu& menu, wxCommandEvent& event);
- void OnModusBrowse(wxMenu& menu, wxCommandEvent& event);
- void OnMouseMove(wxMouseEvent& event);
- int  OnTableView(wxString Table);
- void OnLabelLeftClick( wxGridEvent& );
- void OnLabelRightClick( wxGridEvent& );
- void OnLabelLeftDClick( wxGridEvent& );
- void OnLabelRightDClick( wxGridEvent& );
- void OnCellLeftClick( wxGridEvent& );
- void OnCellRightClick( wxGridEvent& );
- void OnCellLeftDClick( wxGridEvent& );
- void OnCellRightDClick( wxGridEvent& );
- void OnRowSize( wxGridSizeEvent& );
- void OnColSize( wxGridSizeEvent& );
- void OnRangeSelected( wxGridRangeSelectEvent& );
- void OnCellChange( wxGridEvent& );
- //---------------------------------------------------------------------------------------
- DECLARE_EVENT_TABLE()
+public:
+    DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wxSize& size, long style);
+    virtual ~DBGrid();
+    //---------------------------------------------------------------------------------------
+    int        i_TabArt;   // Tab = 0 ; Page = 1;
+    int        i_ViewNr;   // View Nummer in Tab / Page
+    int        i_Which;    // Which View, Database is this/using
+    //---------------------------------------------------------------------------------------
+    MainDoc*   pDoc;
+    wxDbInf*   ct_BrowserDB;
+    BrowserDB* db_Br;
+    wxMenu   *popupMenu1; // OnDBClass
+    wxMenu   *popupMenu2; // OnDBGrid & OnTableclass
+    bool     b_EditModus;
+    //---------------------------------------------------------------------------------------
+    wxString logBuf,Temp0;
+    wxPoint  MousePos;
+    //---------------------------------------------------------------------------------------
+    void OnModusEdit(wxCommandEvent& event);
+    void OnModusBrowse(wxCommandEvent& event);
+    void OnMouseMove(wxMouseEvent& event);
+    int  OnTableView(wxString Table);
+    //-----
+    void OnCellChange( wxGridEvent& );
+    void OnCellLeftClick( wxGridEvent& );
+    void OnCellLeftDClick( wxGridEvent& );
+    void OnCellRightClick( wxGridEvent& );
+    void OnCellRightDClick( wxGridEvent& );
+    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 OnRowSize( wxGridSizeEvent& );
+    void OnSelectCell( wxGridEvent& );
+    //---------------------------------------------------------------------------------------
+    DECLARE_EVENT_TABLE()

 };
 };

+

 //----------------------------------------------------------------------------------------
 #define GRID_01_BEGIN      1200
 #define GRID_BROWSE        1201
 #define GRID_EDIT          1202
 #define GRID_01_END        1203
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
 #define GRID_01_BEGIN      1200
 #define GRID_BROWSE        1201
 #define GRID_EDIT          1202
 #define GRID_01_END        1203
 //----------------------------------------------------------------------------------------

+