Change GetC to return an int so that it can return wxEOF on error.

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

diff --git a/include/wx/gtk1/dialog.h b/include/wx/gtk1/dialog.h
index 7050e0b05e22efa791a33d1d384fcad76eba75b4..da34a90902eb1df54f37991af3b8131575dddeb1 100644 (file)
--- a/include/wx/gtk1/dialog.h
+++ b/include/wx/gtk1/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/gtk1/dialog.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:
 // Purpose:
 // Author:      Robert Roebling
 // Created:


@@ -11,31 +11,25 @@
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 
 #ifndef __GTKDIALOGH__
 #define __GTKDIALOGH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/defs.h"

-#include "wx/panel.h"
-#include "wx/icon.h"

 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 

-class wxDialog;
+class WXDLLIMPEXP_CORE wxDialog;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar *wxDialogNameStr;
+extern WXDLLIMPEXP_CORE const wxChar wxDialogNameStr[];

 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 

-class wxDialog: public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase

 {
 public:
     wxDialog() { Init(); }
 {
 public:
     wxDialog() { Init(); }


@@ -51,65 +45,32 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );

-    ~wxDialog();
-
-    void SetTitle(const wxString& title);
-    wxString GetTitle() const;
+    virtual ~wxDialog() {}

 
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );
     void OnOK( wxCommandEvent &event );
     void OnPaint( wxPaintEvent& event );
 
     void OnApply( wxCommandEvent &event );
     void OnCancel( wxCommandEvent &event );
     void OnOK( wxCommandEvent &event );
     void OnPaint( wxPaintEvent& event );

-    void OnSize( wxSizeEvent &event );

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

-    bool Destroy();
-
-    virtual bool Show( bool show );
+    virtual bool Show( bool show = TRUE );

     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
     void SetModal( bool modal );
 
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
     void SetModal( bool modal );
 

-    virtual void InitDialog(void);
-
-    virtual void SetIcon( const wxIcon &icon );
-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }
-    bool Iconized() const { return IsIconized(); }
-    virtual void Maximize() { }
-    virtual void Restore() { }
-
-    virtual bool IsTopLevel() const { return TRUE; }
-    

     // implementation
     // --------------
 
     // implementation
     // --------------
 

-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize()
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    
-    virtual void GtkOnSize( int x, int y, int width, int height );
-    virtual void OnInternalIdle();
-

     bool       m_modalShowing;
     bool       m_modalShowing;

-    wxString   m_title;
-    wxIcon     m_icon;

 
 protected:
     // common part of all ctors
     void Init();
 
 
 protected:
     // common part of all ctors
     void Init();
 

-    // common part of Destroy() and ~wxDialog
-    void CleanUp();
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-

 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxDialog)
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxDialog)