1) APPCONF_ constants renamed to wxCONFIG_

[wxWidgets.git] / include / wx / gtk1 / dialog.h

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 6c9c99e2a1b363a6c819dcaeaa9679b2a5ee511a..db28c7772b6b255fa3ac139d8406126091ce28fb 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -53,10 +53,10 @@ class wxDialog: public wxWindow
     wxDialog(void);
     wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
     wxDialog(void);
     wxDialog( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 

-      const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
+      long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );

     bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
     bool Create( wxWindow *parent, wxWindowID id, const wxString &title,
       const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 

-      const long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );
+      long style = wxDEFAULT_DIALOG_STYLE, const wxString &name = wxDialogNameStr );

     ~wxDialog(void);
     void SetTitle(const wxString& title);
     wxString GetTitle(void) const;
     ~wxDialog(void);
     void SetTitle(const wxString& title);
     wxString GetTitle(void) const;


@@ -65,20 +65,16 @@ class wxDialog: public wxWindow
     void OnCancel( wxCommandEvent &event );
     void OnOk( wxCommandEvent &event );
     void OnPaint(wxPaintEvent& event);
     void OnCancel( wxCommandEvent &event );
     void OnOk( wxCommandEvent &event );
     void OnPaint(wxPaintEvent& event);

+    bool Destroy(void);

     void OnCloseWindow(wxCloseEvent& event);
 /*
     void OnCharHook(wxKeyEvent& event);
 */
     void OnCloseWindow(wxCloseEvent& event);
 /*
     void OnCharHook(wxKeyEvent& event);
 */

-    virtual bool Show( const bool show );
+    virtual bool Show( bool show );

     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
     virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
     virtual void InitDialog(void);
     virtual int ShowModal(void);
     virtual void EndModal(int retCode);
     virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
     virtual void InitDialog(void);

-/*
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-*/

     
   private:
   
     
   private: