Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index f55129ccf9df6c929987938f3b66b03d3e9216ef..5fb90d68c31789463d1caa691358f9f6d78ab44e 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
@@ -18,16 +18,14 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxPanel
+class WXDLLEXPORT wxDialog : public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
 public:
-    wxDialog();
-    
+    wxDialog() { Init(); }
+
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
              const wxString& title, bool modal,
@@ -39,7 +37,7 @@ public:
         Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
                style | modalStyle, name);
     }
-    
+
     // Constructor with no modal flag - the new convention.
     wxDialog(wxWindow *parent, wxWindowID id,
              const wxString& title,
@@ -50,72 +48,86 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
-    
+
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxString& title,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_DIALOG_STYLE,
                 const wxString& name = wxDialogNameStr);
-    
+
     ~wxDialog();
-    
+
+    // override some base class virtuals
     virtual bool Destroy();
-    
-    virtual void SetClientSize(int width, int height);
-    
-    virtual void GetPosition(int *x, int *y) const;
-    
-    bool Show(bool show);
-    bool IsShown() const;
-    void Iconize(bool iconize);
-    
+    virtual bool Show(bool show);
+    virtual void Iconize(bool iconize);
+    virtual bool IsIconized() const;
+
+    virtual bool IsTopLevel() const { return TRUE; }
+
+    void SetModal(bool flag);
+    virtual bool IsModal() const;
+
+    // For now, same as Show(TRUE) but returns return code
+    virtual int ShowModal();
+
+    // may be called to terminate the dialog with the given return code
+    virtual void EndModal(int retCode);
+
+    // returns TRUE if we're in a modal loop
+    bool IsModalShowing() const;
+
 #if WXWIN_COMPATIBILITY
     bool Iconized() const { return IsIconized(); };
 #endif
-    
-    virtual bool IsIconized() const;
-    void Fit();
-    
-    void SetTitle(const wxString& title);
-    wxString GetTitle() const ;
-    
-    void OnSize(wxSizeEvent& event);
+
+    // wxMSW only: remove the "Close" button from the dialog
+    bool EnableCloseButton(bool enable = TRUE);
+
+    // implementation only from now on
+    // -------------------------------
+
+    // event handlers
     bool OnClose();
     void OnCharHook(wxKeyEvent& event);
-    void OnPaint(wxPaintEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-    
-    void SetModal(bool flag);
-    
-    virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const
-        { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
-    
-    // For now, same as Show(TRUE) but returns return code
-    virtual int ShowModal();
-    virtual void EndModal(int retCode);
-    
+
     // Standard buttons
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
-    
+
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
-    
-    // IMPLEMENTATION
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-    virtual bool MSWOnClose();
+
+    // Windows callbacks
+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
+#if wxUSE_CTL3D
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    
-    bool IsModalShowing() const { return m_modalShowing; }
+#endif // wxUSE_CTL3D
 
 protected:
-    bool   m_modalShowing;
-    WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
-    
+    // override more base class virtuals
+    virtual void DoSetClientSize(int width, int height);
+    virtual void DoGetPosition(int *x, int *y) const;
+
+    // show modal dialog and enter modal loop
+    void DoShowModal();
+
+    // common part of all ctors
+    void Init();
+
+private:
+    wxWindow *m_oldFocus;
+
+    // while we are showing a modal dialog we disable the other windows using
+    // this object
+    class wxWindowDisabler *m_windowDisabler;
+
+    DECLARE_DYNAMIC_CLASS(wxDialog)
     DECLARE_EVENT_TABLE()
 };