wxChar -> char

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index f5609682f5a95838a1b395d7a45e97134fc2026f..4a0d30a3f27d155f5ea0db14e9d6b90a47d345ab 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,111 +1,128 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDialog class
 // Purpose:     wxDialog class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/14/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 

-#ifdef __GNUG__
-#pragma interface "dialog.h"
-#endif
-

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

-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];
+
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;

 
 

+//

 // Dialog boxes
 // Dialog boxes

+//

 class WXDLLEXPORT wxDialog: public wxDialogBase
 {
 class WXDLLEXPORT wxDialog: public wxDialogBase
 {

-  DECLARE_DYNAMIC_CLASS(wxDialog)

 public:
 
 public:
 

-  wxDialog();
-
-  // Constructor with a modal flag, but no window id - the old convention
-  inline wxDialog( wxWindow*       parent
-                  ,const wxString& title
-                  ,bool            modal
-                  ,int             x = -1
-                  ,int             y = -1
-                  ,int             width = 500
-                  ,int             height = 500
-                  ,long            style = wxDEFAULT_DIALOG_STYLE
-                  ,const wxString& name = wxDialogNameStr
-                 )
-    {
-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name);
-    }
+  inline wxDialog() { Init(); }

 
 

-    // Constructor with no modal flag - the new convention.
-    inline wxDialog( wxWindow*       parent
-                    ,wxWindowID      id
-                    ,const wxString& title
-                    ,const wxPoint&  pos = wxDefaultPosition
-                    ,const wxSize&   size = wxDefaultSize
-                    ,long            style = wxDEFAULT_DIALOG_STYLE
-                    ,const wxString& name = wxDialogNameStr
-                   )
+    // full ctor
+    wxDialog(wxWindow *parent, wxWindowID id,
+             const wxString& title,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxDEFAULT_DIALOG_STYLE,
+             const wxString& name = wxDialogNameStr)

     {
     {

-        Create(parent, id, title, pos, size, style, name);
+        Init();
+
+        (void)Create(parent, id, title, pos, size, style, name);

     }
 
     }
 

-    bool Create( wxWindow*       parent
-                ,wxWindowID      id
-                ,const wxString& title
-                , // bool modal = FALSE, // TODO make this a window style?
-                 const wxPoint&  pos = wxDefaultPosition
-                ,const wxSize&   size = wxDefaultSize
-                ,long            style = wxDEFAULT_DIALOG_STYLE
-                ,const wxString& name = wxDialogNameStr
+    bool Create( wxWindow*       pParent
+                ,wxWindowID      vId
+                ,const wxString& rsTitle
+                ,const wxPoint&  rPos = wxDefaultPosition
+                ,const wxSize&   rSize = wxDefaultSize
+                ,long            lStyle = wxDEFAULT_DIALOG_STYLE
+                ,const wxString& rsName = wxDialogNameStr

                );
                );

+    virtual ~wxDialog();

 
 

-    ~wxDialog();
-
-// ---------------------------------------------------------------------------
-//  Virtuals
-// ---------------------------------------------------------------------------
+    // return true if we're showing the dialog modally
+    virtual bool IsModal() const { return m_modalData != NULL; }

 
 

-    virtual bool Destroy();
-    virtual bool IsIconized() const;
-    virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    // show the dialog modally and return the value passed to EndModal()
+    virtual int ShowModal();

 
 

-    virtual int  ShowModal();
+    // may be called to terminate the dialog with the given return code

     virtual void EndModal(int retCode);
 
     virtual void EndModal(int retCode);
 

-    void     SetClientSize(int width, int height);
-    void     GetPosition(int *x, int *y) const;
-    bool     Show(bool show);
-    void     Iconize(bool iconize);
-
-    void     Fit();
-
-    void     SetTitle(const wxString& title);
-    wxString GetTitle() const ;
-
-    void     OnCharHook(wxKeyEvent& event);
-    void     OnCloseWindow(wxCloseEvent& event);
-
-    void     SetModal(bool flag);
-
-    // Standard buttons
-    void     OnOK(wxCommandEvent& event);
-    void     OnApply(wxCommandEvent& event);
-    void     OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void     OnSysColourChanged(wxSysColourChangedEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_DIALOG_H_
+    // implementation only from now on
+    // -------------------------------
+
+    // override some base class virtuals
+    virtual bool Show(bool show = true);
+
+    //
+    // Callbacks
+    //
+    virtual MRESULT OS2WindowProc( WXUINT   uMessage
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+#if WXWIN_COMPATIBILITY_2_6
+
+    // Constructor with a modal flag, but no window id - the old convention
+    wxDEPRECATED( wxDialog( wxWindow*       pParent
+                           ,const wxString& rsTitle
+                           ,bool            bModal
+                           ,int             nX = -1
+                           ,int             nY = -1
+                           ,int             nWidth = 500
+                           ,int             nHeight = 500
+                           ,long            lStyle = wxDEFAULT_DIALOG_STYLE
+                           ,const wxString& rsName = wxDialogNameStr
+                          ) );
+
+    // just call Show() or ShowModal()
+    wxDEPRECATED( void SetModal(bool bFlag) );
+
+    // use IsModal()
+    wxDEPRECATED( bool IsModalShowing() const );
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+protected:
+    //
+    // find the window to use as parent for this dialog if none has been
+    // specified explicitly by the user
+    //
+    // may return NULL
+    //
+    wxWindow *FindSuitableParent() const;
+
+    //
+    // Common part of all ctors
+    //
+    void Init(void);
+
+private:
+    wxWindow*                       m_pOldFocus;
+    bool        m_endModalCalled; // allow for closing within InitDialog
+
+    // this pointer is non-NULL only while the modal event loop is running
+    wxDialogModalData *m_modalData;
+
+    //
+    // While we are showing a modal dialog we disable the other windows using
+    // this object
+    //
+    class wxWindowDisabler*         m_pWindowDisabler;
+
+    DECLARE_DYNAMIC_CLASS(wxDialog)
+    DECLARE_NO_COPY_CLASS(wxDialog)
+}; // end of CLASS wxDialog
+
+#endif // _WX_DIALOG_H_