A fix for attribrute sorting, but it's still broken if there are

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 0571fb5c53a181743bd32664bdbaadd6d34bd7c0..5a01bed637ad96ddbe888856ca193308f4b9f8a2 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,114 +1,180 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.h
 // Purpose:     wxDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.h
 // 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"
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 #include "wx/panel.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 

+//

 // Dialog boxes
 // Dialog boxes

+//

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

-  DECLARE_DYNAMIC_CLASS(wxDialog)

 public:
 
 public:
 

-  wxDialog();
+  inline wxDialog() { Init(); }

 
 

+  //

   // Constructor with a modal flag, but no window id - the old convention
   // 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
+  //
+  inline 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

                  )
     {
                  )
     {

-        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name);
+        long                        lModalStyle = lStyle ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
+
+        Create( pParent
+               ,-1
+               ,rsTitle
+               ,wxPoint(nX, nY)
+               ,wxSize(nWidth, nHeight)
+               ,lStyle | lModalStyle
+               ,rsName
+              );

     }
 
     }
 

+    //

     // Constructor with no modal flag - the new convention.
     // 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
+    //
+    inline wxDialog( wxWindow*       pParent
+                    ,wxWindowID      vId
+                    ,const wxString& rsTitle
+                    ,const wxPoint&  rPos = wxDefaultPosition
+                    ,const wxSize&   rSize = wxDefaultSize
+                    ,long            lStyle = wxDEFAULT_DIALOG_STYLE
+                    ,const wxString& rsName = wxDialogNameStr

                    )
     {
                    )
     {

-        Create(parent, id, title, pos, size, style, name);
+        Create( pParent
+               ,vId
+               ,rsTitle
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rsName
+              );

     }
 
     }
 

-    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

                );
                );

-

     ~wxDialog();
 
     ~wxDialog();
 

-// ---------------------------------------------------------------------------
-//  Virtuals
-// ---------------------------------------------------------------------------
+    virtual bool Destroy(void);
+    virtual bool Show(bool bShow);
+    virtual void Iconize(bool bIconize);
+    virtual bool IsIconized(void) const;

 
 

-    virtual bool Destroy();
-    virtual bool IsIconized() const;
-    virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    virtual bool IsTopLevel(void) const { return TRUE; }

 
 

-    virtual int  ShowModal();
-    virtual void EndModal(int retCode);
+    void         SetModal(bool bFlag);
+    virtual bool IsModal(void) const;

 
 

-    void     SetClientSize(int width, int height) { wxWindow::DoSetClientSize(width, height); };
-    void     SetClientSize( const wxSize& size ) { wxWindow::DoSetClientSize(size.x, size.y); };
-    void     SetClientSize(const wxRect& rect) { SetClientSize( rect.width, rect.height ); };
+    //
+    // For now, same as Show(TRUE) but returns return code
+    //
+    virtual int  ShowModal(void);
+    virtual void EndModal(int nRetCode);

 
 

-    void     GetPosition(int *x, int *y) const;
-    bool     Show(bool show);
-    void     Iconize(bool iconize);
+    //
+    // Returns TRUE if we're in a modal loop
+    //
+    bool IsModalShowing() const;

 
 

-    void     Fit();
+#if WXWIN_COMPATIBILITY
+    bool Iconized() const { return IsIconized(); };
+#endif

 
 

-    void     SetTitle(const wxString& title);
-    wxString GetTitle() const ;
+    //
+    // Implementation only from now on
+    // -------------------------------
+    //

 
 

-    void     OnCharHook(wxKeyEvent& event);
-    void     OnCloseWindow(wxCloseEvent& event);
+    //
+    // Event handlers
+    //
+    bool OnClose(void);
+    void OnCharHook(wxKeyEvent& rEvent);
+    void OnCloseWindow(wxCloseEvent& rEvent);

 
 

-    void     SetModal(bool flag);
+    //
+    // May be called to terminate the dialog with the given return code
+    //

 
 

+    //

     // Standard buttons
     // Standard buttons

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

 
 

+    //

     // Responds to colour changes
     // Responds to colour changes

-    void     OnSysColourChanged(wxSysColourChangedEvent& event);
-
-DECLARE_EVENT_TABLE()
-};
+    //
+    void     OnSysColourChanged(wxSysColourChangedEvent& rEvent);
+
+    //
+    // Callbacks
+    //
+    virtual MRESULT OS2WindowProc( WXUINT   uMessage
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+protected:
+    //
+    // Override more base class virtuals
+    //
+    virtual void DoSetClientSize( int nWidth
+                                 ,int nHeight
+                                );
+    virtual void DoGetPosition( int* pnX
+                               ,int* pnY
+                              ) const;
+    //
+    // Show modal dialog and enter modal loop
+    //
+    void DoShowModal(void);
+
+    //
+    // Common part of all ctors
+    //
+    void Init();
+
+private:
+    wxWindow*                       m_pOldFocus;
+
+    //
+    // While we are showing a modal dialog we disable the other windows using
+    // this object
+    //
+    class wxWindowDisabler*         m_pWindowDisabler;
+
+    DECLARE_DYNAMIC_CLASS(wxDialog)
+    DECLARE_EVENT_TABLE()
+}; // end of CLASS wxDialog
+
+#endif // _WX_DIALOG_H_

 
 

-#endif
-    // _WX_DIALOG_H_