/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/msw/dialog.h
// Purpose: wxDialog class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DIALOG_H_
#define _WX_DIALOG_H_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "dialog.h"
#endif
#include "wx/panel.h"
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
+
+class WXDLLEXPORT wxDialogModalData;
// Dialog boxes
-class WXDLLEXPORT wxDialog : public wxPanel
+class WXDLLEXPORT wxDialog : public wxDialogBase
{
- DECLARE_DYNAMIC_CLASS(wxDialog)
-
public:
- wxDialog();
-
- // Constructor with a modal flag, but no window id - the old convention
- 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);
- }
-
- // Constructor with no modal flag - the new convention.
+ wxDialog() { Init(); }
+
+ // full ctor
wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
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,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr);
-
- ~wxDialog();
-
- 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);
-
-#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);
- 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 ~wxDialog();
+
+ // return true if we're showing the dialog modally
+ virtual bool IsModal() const { return m_modalData != NULL; }
+
+ // show the dialog modally and return the value passed to EndModal()
virtual int ShowModal();
+
+ // may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
-
+
+ // implementation only from now on
+ // -------------------------------
+
+ // override some base class virtuals
+ virtual bool Show(bool show = true);
+
+ virtual void Raise();
+
+ // event handlers
+ void OnCharHook(wxKeyEvent& event);
+ void OnCloseWindow(wxCloseEvent& event);
+
// 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();
- virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
- bool IsModalShowing() const { return m_modalShowing; }
+
+ // Windows callbacks
+ WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
+ // obsolete methods
+ // ----------------
+
+ // use the other ctor
+ wxDEPRECATED( wxDialog(wxWindow *parent,
+ const wxString& title, bool modal,
+ int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500,
+ long style = wxDEFAULT_DIALOG_STYLE,
+ const wxString& name = wxDialogNameStr) );
+
+ // just call Show() or ShowModal()
+ wxDEPRECATED( void SetModal(bool flag) );
+
+ // use IsModal()
+ wxDEPRECATED( bool IsModalShowing() const );
protected:
- bool m_modalShowing;
- WXHWND m_hwndOldFocus; // the window which had focus before we were shown
-
+ // 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();
+
+ // end either modal or modeless dialog
+ void EndDialog(int rc);
+
+private:
+ wxWindow* m_oldFocus;
+ bool m_endModalCalled; // allow for closing within InitDialog
+
+ // this pointer is non-NULL only while the modal event loop is running
+ wxDialogModalData *m_modalData;
+
+
+ DECLARE_DYNAMIC_CLASS(wxDialog)
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxDialog)
};
#endif
projects / wxWidgets.git / blobdiff