X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bfc6fde4b1dd5bfd8ae22839ff9a69cf24eb9120..8366ae934aab9f835747b0c2e456231e8795fe78:/include/wx/motif/dialog.h

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index 2fde3e3060..df9688ddee 100644
--- a/include/wx/motif/dialog.h
+++ b/include/wx/motif/dialog.h
@@ -6,22 +6,20 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifdef __GNUG__
-#pragma interface "dialog.h"
+    #pragma interface "dialog.h"
 #endif
 
-#include "wx/panel.h"
-
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxPanel
+class WXDLLEXPORT wxDialog : public wxDialogBase
 {
 DECLARE_DYNAMIC_CLASS(wxDialog)
 
@@ -67,38 +65,44 @@ public:
     void Lower();
 
     virtual bool IsIconized() const;
-    void Fit();
 
+    virtual bool IsTopLevel() const { return TRUE; }
+    
     void SetTitle(const wxString& title);
     wxString GetTitle() const ;
 
-    //  bool OnClose();
-    void OnCharHook(wxKeyEvent& 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); }
+    virtual bool IsModal() const
+        { 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);
 
-    // 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; }
+    //  bool OnClose();
+    void OnCharHook(wxKeyEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
 
+    // Responds to size changes
+    void OnSize(wxSizeEvent& event);
+    
 public:
     //// Motif-specific
     bool          m_modalShowing;