Updates to wxFrame to include SHowFullScreen method

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

diff --git a/demos/dbbrowse/dbgrid.cpp b/demos/dbbrowse/dbgrid.cpp
index c54e3b4a44012856566d6a396565ad8bcbba2e45..f84b628f962f07612a7381586feaf5263d583d03 100644 (file)
--- a/demos/dbbrowse/dbgrid.cpp
+++ b/demos/dbbrowse/dbgrid.cpp
@@ -74,6 +74,8 @@ DBGrid::DBGrid(wxWindow *parent, const wxWindowID id,const wxPoint& pos,const wx
 //----------------------------------------------------------------------------------------
 DBGrid::~DBGrid()
 {
+ delete popupMenu1;
+ delete popupMenu2;
 }
 //----------------------------------------------------------------------------------------
 int  DBGrid::OnTableView(wxString Table)
@@ -122,7 +124,7 @@ int  DBGrid::OnTableView(wxString Table)
       }
       if (z % 50 == 0)
       {
-       Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - Record %6d has been read."),Table.c_str(),z);
+       Temp0.Printf(_("-I-> DBGrid::OnTableView(%s) - Record %6d (from %d) has been read."),Table.c_str(),z,(db_Br+i_Which)->i_Records);
        pDoc->p_MainFrame->SetStatusText(Temp0, 0);
       }
      }  // for (z=0;z<(db_Br+i_Which)->i_Records;z++)
@@ -148,7 +150,7 @@ int  DBGrid::OnTableView(wxString Table)
  return 0;
 }
 //----------------------------------------------------------------------------------------
-void DBGrid::OnModusEdit(wxMenu& menu, wxCommandEvent& event)
+void DBGrid::OnModusEdit(wxCommandEvent& event)
 {
  b_EditModus = TRUE;             // Needed by PopupMenu
  EnableEditing(b_EditModus);     // Activate in-place Editing
@@ -156,7 +158,7 @@ void DBGrid::OnModusEdit(wxMenu& menu, wxCommandEvent& event)
  // wxLogMessage(_("-I-> DBGrid::OnModusEdit() - End"));
 }
 //----------------------------------------------------------------------------------------
-void DBGrid::OnModusBrowse(wxMenu& menu, wxCommandEvent& event)
+void DBGrid::OnModusBrowse(wxCommandEvent& event)
 {
  b_EditModus = FALSE;            // Needed by PopupMenu
  EnableEditing(b_EditModus);     // Deactivate in-place Editing