diff -Naur pgadmin3-20040718.orig/src/include/dlgClasses.h pgadmin3-20040718/src/include/dlgClasses.h --- pgadmin3-20040718.orig/src/include/dlgClasses.h 2004-06-21 19:06:00.000000000 +0200 +++ pgadmin3-20040718/src/include/dlgClasses.h 2004-07-18 11:08:29.642299039 +0200 @@ -30,10 +30,10 @@ void RestorePosition(int defaultX=-1, int defaultY=-1, int defaultW=-1, int defaultH=-1, int minW=100, int minH=70); void SavePosition(); void LoadResource(const wxChar *name=0); - -protected: void OnCancel(wxCommandEvent& ev); void OnClose(wxCloseEvent& event); + +protected: wxString dlgName; DECLARE_EVENT_TABLE(); @@ -104,6 +104,8 @@ virtual wxString GetCmd(int step)=0; bool Execute(int step=0); void Abort(); + void OnCancel(wxCommandEvent& ev); + void OnClose(wxCloseEvent& event); protected: wxTextCtrl *txtMessages; @@ -112,8 +114,6 @@ bool done; void OnOK(wxCommandEvent& ev); - void OnCancel(wxCommandEvent& ev); - void OnClose(wxCloseEvent& event); void OnEndProcess(wxProcessEvent& event); void OnPollProcess(wxTimerEvent& event);