Disabled memory tracing code for mingw32,

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index d4d91e380e94fb1426ee1519293492ed41346e2b..ac570e9c29c21bebe1e49e836a9d0bd7eecc5871 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.h
 // Purpose:     wxDialog class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/14/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#ifdef __GNUG__
-#pragma interface "dialog.h"
-#endif
-
 #include "wx/panel.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
@@ -69,18 +65,20 @@ public:
 
     ~wxDialog();
 
-// ---------------------------------------------------------------------------
-//  Virtuals
-// ---------------------------------------------------------------------------
-
     virtual bool Destroy();
+
     virtual void DoSetClientSize(int width, int height);
+
     virtual void GetPosition(int *x, int *y) const;
 
     bool Show(bool show);
     bool IsShown() const;
     void Iconize(bool iconize);
 
+#if WXWIN_COMPATIBILITY
+    bool Iconized() const { return IsIconized(); };
+#endif
+
     virtual bool IsIconized() const;
     void         Fit();
 
@@ -112,7 +110,7 @@ public:
 
     // implementation
     // --------------
-    virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual MRESULT OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);