[pgadmin-hackers] CVS Commit by andreas: gcc fix

[cvs]

Log Message:
-----------
gcc fix

Modified Files:
--------------
    pgadmin3/src/ui:
        frmStatus.cpp (r1.21 -> r1.22)
    pgadmin3/src/include:
        frmStatus.h (r1.9 -> r1.10)


Index: frmStatus.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmStatus.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ui/frmStatus.cpp -Lsrc/ui/frmStatus.cpp -u -w -r1.21 -r1.22
--- src/ui/frmStatus.cpp
+++ src/ui/frmStatus.cpp
@@ -27,7 +27,7 @@
 #define TIMER_ID 333
 BEGIN_EVENT_TABLE(frmStatus, pgDialog)
     EVT_BUTTON(XRCID("btnRefresh"),         frmStatus::OnRefresh)
-    EVT_BUTTON (XRCID("btnClose"),          frmStatus::OnClose)
+    EVT_BUTTON (XRCID("btnClose"),          frmStatus::OnCloseBtn)
     EVT_CLOSE(                              frmStatus::OnClose)
     EVT_SPINCTRL(XRCID("spnRefreshRate"),   frmStatus::OnRateChangeSpin)
     EVT_TEXT(XRCID("spnRefreshRate"),       frmStatus::OnRateChange)
@@ -42,7 +42,12 @@
 #define spnRefreshRate  CTRL_SPIN("spnRefreshRate")
 #define nbStatus               CTRL_NOTEBOOK("nbStatus")
 
-void frmStatus::OnClose(wxCommandEvent &event)
+void frmStatus::OnCloseBtn(wxCommandEvent &event)
+{
+    Destroy();
+}
+
+void frmStatus::OnClose(wxCloseEvent &event)
 {
     Destroy();
 }
@@ -425,7 +430,7 @@
         if (logHasTimestamp)
         {
             wxString ts=str.Mid(logFmtPos);
-            int pos = ts.Mid(22).Find(logFormat[logFmtPos+2]);
+            int pos = ts.Mid(22).Find(logFormat.c_str()[logFmtPos+2]);
             logList->AppendItem(ts.Left(22+pos));
             rest = ts.Mid(22+pos + logFormat.Length() - logFmtPos-2);
             logList->SetItem(row, 1, rest.BeforeFirst(':'));
Index: frmStatus.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmStatus.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/include/frmStatus.h -Lsrc/include/frmStatus.h -u -w -r1.9 -r1.10
--- src/include/frmStatus.h
+++ src/include/frmStatus.h
@@ -35,7 +35,8 @@
     
 private:
     void OnHelp(wxCommandEvent& ev);
-    void OnClose(wxCommandEvent &event);
+    void OnCloseBtn(wxCommandEvent &event);
+    void OnClose(wxCloseEvent &event);
     void OnRefresh(wxCommandEvent &event);
     void OnRefreshTimer(wxTimerEvent &event);
     void OnRateChange(wxCommandEvent &event);
---------------------------(end of broadcast)---------------------------
TIP 9: the planner will ignore your desire to choose an index scan if your
      joining column's datatypes do not match