VA 4.0 fixes

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index c4e4a0b6ce19e0c90c5adf891418e6290be33fd0..f7a07592f8bac109087f26a00de20b415d873f93 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -18,10 +18,10 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;

 
 // Dialog boxes
 
 // Dialog boxes

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

 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 


@@ -60,9 +60,6 @@ public:
 
     ~wxDialog();
 
 
     ~wxDialog();
 

-    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
-    int GetReturnCode() const { return m_returnCode; }
-

     virtual bool Destroy();
 
     virtual void DoSetClientSize(int width, int height);
     virtual bool Destroy();
 
     virtual void DoSetClientSize(int width, int height);


@@ -80,6 +77,8 @@ public:
     virtual bool IsIconized() const;
     void Fit();
 
     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 ;
 


@@ -92,8 +91,7 @@ public:
     void SetModal(bool flag);
 
     virtual void Centre(int direction = wxBOTH);
     void SetModal(bool flag);
 
     virtual void Centre(int direction = wxBOTH);

-    virtual bool IsModal() const
-        { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    virtual bool IsModal() const;

 
     // For now, same as Show(TRUE) but returns return code
     virtual int ShowModal();
 
     // For now, same as Show(TRUE) but returns return code
     virtual int ShowModal();


@@ -110,6 +108,8 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+

     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 


@@ -130,8 +130,7 @@ private:
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 

-    int m_returnCode;
-
+private:

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };