/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.h
+// Name: wx/motif/dialog.h
// Purpose: wxDialog class
// Author: Julian Smart
// Modified by:
#ifndef _WX_DIALOG_H_
#define _WX_DIALOG_H_
-#ifdef __GNUG__
-#pragma interface "dialog.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+class WXDLLEXPORT wxEventLoop;
// Dialog boxes
class WXDLLEXPORT wxDialog : public wxDialogBase
{
- DECLARE_DYNAMIC_CLASS(wxDialog)
-
public:
wxDialog();
-#if WXWIN_COMPATIBILITY_2
- // 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);
- }
-#endif
-
- // Constructor with no modal flag - the new convention.
wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
}
bool Create(wxWindow *parent, wxWindowID id,
- const wxString& title, // bool modal = FALSE, // TODO make this a window style?
+ const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
virtual bool Destroy();
- virtual bool Show(bool show = TRUE);
+ virtual bool Show(bool show = true);
void SetTitle(const wxString& title);
void SetModal(bool flag);
virtual bool IsModal() const
- { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+ { return m_modalShowing; }
virtual int ShowModal();
virtual void EndModal(int retCode);
// Implementation
- virtual void ChangeFont(bool keepOriginalSize = TRUE);
+ 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);
-
- // Responds to colour changes
- void OnSysColourChanged(wxSysColourChangedEvent& event);
-
- void OnCharHook(wxKeyEvent& event);
- void OnCloseWindow(wxCloseEvent& event);
+ WXWidget GetTopWidget() const { return m_mainWidget; }
+ WXWidget GetClientWidget() const { return m_mainWidget; }
private:
- virtual bool DoCreate( wxWindow* parent, wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name );
- virtual void DoDestroy();
+ virtual bool XmDoCreateTLW(wxWindow* parent,
+ wxWindowID id,
+ const wxString& title,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name);
+
//// Motif-specific
bool m_modalShowing;
+ wxEventLoop* m_eventLoop;
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()
+ DECLARE_DYNAMIC_CLASS(wxDialog)
};
-#endif
-// _WX_DIALOG_H_
+#endif // _WX_DIALOG_H_