wxRadioBox fixed on mac

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 899febae544a301ad5142d919bb5c6181bfb3889..f97ed29db02da90be9789192304491cad5f90ccb 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -18,15 +18,13 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;

 
 // Dialog boxes
 
 // Dialog boxes

-class WXDLLEXPORT wxDialog : public wxPanel
+class WXDLLEXPORT wxDialog : public wxDialogBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxDialog)
-

 public:
 public:

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

 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,


@@ -60,45 +58,38 @@ public:
 
     ~wxDialog();
 
 
     ~wxDialog();
 

-    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
-    int GetReturnCode() const { return m_returnCode; }
-
+    // override some base class virtuals

     virtual bool Destroy();
     virtual bool Destroy();

+    virtual bool Show(bool show);
+    virtual void Iconize(bool iconize);
+    virtual bool IsIconized() const;

 
 

-    virtual void DoSetClientSize(int width, int height);
+    virtual bool IsTopLevel() const { return TRUE; }

 
 

-    virtual void GetPosition(int *x, int *y) const;
+    void SetModal(bool flag);
+    virtual bool IsModal() const;

 
 

-    bool Show(bool show);
-    bool IsShown() const;
-    void Iconize(bool iconize);
+    // 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
 
 
 #if WXWIN_COMPATIBILITY
     bool Iconized() const { return IsIconized(); };
 #endif
 

-    virtual bool IsIconized() const;
-    void Fit();
-
-    void SetTitle(const wxString& title);
-    wxString GetTitle() const ;
+    // implementation only from now on
+    // -------------------------------

 
 

-    void OnSize(wxSizeEvent& event);
+    // event handlers

     bool OnClose();
     void OnCharHook(wxKeyEvent& event);
     bool OnClose();
     void OnCharHook(wxKeyEvent& event);

-    void OnPaint(wxPaintEvent& event);

     void OnCloseWindow(wxCloseEvent& 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);
     // Standard buttons
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);


@@ -107,33 +98,33 @@ public:
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 

-    // implementation
-    // --------------
-
+    // Windows callbacks

     long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     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);
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

+#endif // wxUSE_CTL3D

 
 

-    bool IsModalShowing() const { return m_modalShowing; }
+protected:
+    // override more base class virtuals
+    virtual void DoSetClientSize(int width, int height);
+    virtual void DoGetPosition(int *x, int *y) const;

 
 

-  // tooltip management
-#if wxUSE_TOOLTIPS
-    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
-    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
-#endif // tooltips
+    // show modal dialog and enter modal loop
+    void DoShowModal();

 
 

-protected:
-    bool   m_modalShowing;
-    WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
+    // common part of all ctors
+    void Init();

 
 private:
 
 private:

-#if wxUSE_TOOLTIPS
-    WXHWND                m_hwndToolTip;
-#endif // tooltips
+    wxWindow *m_oldFocus;

 
 

-    int m_returnCode;
+    // 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()
 };
 
     DECLARE_EVENT_TABLE()
 };