pragma fix for gcc

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

diff --git a/include/wx/motif/dialog.h b/include/wx/motif/dialog.h
index b929956e96836a80b4b91bbb340884ababc5a152..df9688ddeedafb2b566fe0771ca3e3d307ccd4e7 100644 (file)
--- 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
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifdef __GNUG__

-#pragma interface "dialog.h"
+    #pragma interface "dialog.h"

 #endif
 
 #endif
 

-#include "wx/panel.h"
-

 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 // Dialog boxes
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 // Dialog boxes

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

 {
 DECLARE_DYNAMIC_CLASS(wxDialog)
 
 {
 DECLARE_DYNAMIC_CLASS(wxDialog)
 


@@ -67,47 +65,48 @@ public:
     void Lower();
 
     virtual bool IsIconized() const;
     void Lower();
 
     virtual bool IsIconized() const;

-    void Fit();

 
 

+    virtual bool IsTopLevel() const { return TRUE; }
+    

     void SetTitle(const wxString& title);
     wxString GetTitle() const ;
 
     void SetTitle(const wxString& title);
     wxString GetTitle() const ;
 

-    //  bool OnClose();
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-

     void SetModal(bool flag);
 
     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);
 
 
     virtual int ShowModal();
     virtual void EndModal(int retCode);
 

-    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
-    int GetReturnCode() const { return m_returnCode; }
+    // 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);
 
     // 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);
 
     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;
     wxString      m_dialogTitle;
 public:
     //// Motif-specific
     bool          m_modalShowing;
     wxString      m_dialogTitle;

-    int           m_returnCode;

 
 protected:
     virtual void DoSetSize(int x, int y,
 
 protected:
     virtual void DoSetSize(int x, int y,