X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e877c195bc9ade6d4cb9f96bffb00e81978d740..cbc906ceb79ba18e53fb94a563648b0347a1b15f:/include/wx/motif/dialog.h?ds=sidebyside diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h index 1c01f7f4e9..bdfd0a056d 100644 --- a/include/wx/motif/dialog.h +++ b/include/wx/motif/dialog.h @@ -13,7 +13,7 @@ #define _WX_DIALOG_H_ #ifdef __GNUG__ - #pragma interface "dialog.h" +#pragma interface "dialog.h" #endif WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; @@ -21,83 +21,85 @@ WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr; // Dialog boxes class WXDLLEXPORT wxDialog : public wxDialogBase { -DECLARE_DYNAMIC_CLASS(wxDialog) - + 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) + 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(wxWindow *parent, wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) + 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); } - + 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); - + 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); + ~wxDialog(); - + virtual bool Destroy(); - + bool Show(bool show); void Iconize(bool iconize); void Raise(); void Lower(); - + virtual bool IsIconized() const; - + + virtual bool IsTopLevel() const { return TRUE; } + void SetTitle(const wxString& title); wxString GetTitle() const ; - + void SetModal(bool flag); - + virtual bool IsModal() const - { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } - + { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); } + virtual int ShowModal(); virtual void EndModal(int retCode); - + // Implementation virtual void ChangeFont(bool keepOriginalSize = TRUE); virtual void ChangeBackgroundColour(); virtual void ChangeForegroundColour(); inline WXWidget GetTopWidget() const { return m_mainWidget; } inline WXWidget GetClientWidget() const { return m_mainWidget; } - + // Standard buttons void OnOK(wxCommandEvent& event); void OnApply(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); - + void OnPaint(wxPaintEvent &event); - + // Responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); - + // bool OnClose(); void OnCharHook(wxKeyEvent& event); void OnCloseWindow(wxCloseEvent& event); - + // Responds to size changes void OnSize(wxSizeEvent& event); @@ -105,17 +107,17 @@ public: //// Motif-specific bool m_modalShowing; wxString m_dialogTitle; - + protected: virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - + int width, int height, + int sizeFlags = wxSIZE_AUTO); + virtual void DoSetClientSize(int width, int height); - + private: DECLARE_EVENT_TABLE() }; #endif - // _WX_DIALOG_H_ +// _WX_DIALOG_H_