fix for assert when setting tooltip for a readonly combo

[wxWidgets.git] / src / os2 / dialog.cpp

diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp
index 90afc5040011fd82f00444ef67138ebb1743cd0e..874a9c90a2a3b08bacaaea676fb343dddb551550 100644 (file)
--- a/src/os2/dialog.cpp
+++ b/src/os2/dialog.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.cpp
 // Purpose:     wxDialog class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/14/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -25,10 +25,6 @@
 #include "wx/os2/private.h"
 #include "wx/log.h"
 
 #include "wx/os2/private.h"
 #include "wx/log.h"
 

-#if wxUSE_COMMON_DIALOGS
-#include <commdlg.h>
-#endif
-

 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 
 #define wxDIALOG_DEFAULT_X 300
 #define wxDIALOG_DEFAULT_Y 300
 


@@ -38,7 +34,6 @@ wxWindowList wxModalDialogs;
 wxWindowList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList WXDLLEXPORT wxPendingDelete;
 
 wxWindowList wxModelessWindows;  // Frames and modeless dialogs
 extern wxList WXDLLEXPORT wxPendingDelete;
 

-#if !USE_SHARED_LIBRARY

    IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
    BEGIN_EVENT_TABLE(wxDialog, wxPanel)
    IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
 
    BEGIN_EVENT_TABLE(wxDialog, wxPanel)


@@ -50,7 +45,6 @@ extern wxList WXDLLEXPORT wxPendingDelete;
       EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
       EVT_CLOSE(wxDialog::OnCloseWindow)
    END_EVENT_TABLE()
       EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
       EVT_CLOSE(wxDialog::OnCloseWindow)
    END_EVENT_TABLE()

-#endif

 
 wxDialog::wxDialog()
 {
 
 wxDialog::wxDialog()
 {


@@ -429,7 +423,7 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
   Refresh();
 }
 
   Refresh();
 }
 

-MRESULT wxDialog::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+MRESULT wxDialog::OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
     MRESULT rc = 0;
     bool    processed = FALSE;
 {
     MRESULT rc = 0;
     bool    processed = FALSE;


@@ -444,7 +438,7 @@ MRESULT wxDialog::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLP
     }
 
     if ( !processed )
     }
 
     if ( !processed )

-        rc = wxWindow::OS2WindowProc(hwnd, message, wParam, lParam);
+        rc = wxWindow::OS2WindowProc(message, wParam, lParam);

 
     return rc;
 }
 
     return rc;
 }