Added George Tasker's forward slash fix to file dialog; added some consts to prntbase.h;

[wxWidgets.git] / src / msw / control.cpp

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 297d81e8fbf7cd02f57744fa5e39688186cd8147..d027e9d5e5decc9e8391fa3c68095e52ef4046c7 100644 (file)
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -21,13 +21,16 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+#include "wx/event.h"

 #include "wx/app.h"
 #include "wx/dcclient.h"
 #endif
 
 #include "wx/app.h"
 #include "wx/dcclient.h"
 #endif
 

+#include "wx/control.h"
+

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)

 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 


@@ -61,7 +64,7 @@ wxControl::~wxControl(void)
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {
   wxWindow *parent = (wxWindow *)GetParent();
   if (parent)
   {

-    if (parent->GetDefaultItem() == this)
+    if (parent->GetDefaultItem() == (wxButton*) this)

         parent->SetDefaultItem(NULL);
   }
 }
         parent->SetDefaultItem(NULL);
   }
 }


@@ -180,13 +183,8 @@ void wxControl::MSWOnMouseMove(int x, int y, WXUINT flags)
     Default();
 }
 
     Default();
 }
 

-long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
-

 bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
 bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,

-                          WXLPARAM* WXUNUSED(result))
+                          WXLPARAM* result)

 {
 #if defined(__WIN95__)
        wxCommandEvent event(wxEVT_NULL, m_windowId);
 {
 #if defined(__WIN95__)
        wxCommandEvent event(wxEVT_NULL, m_windowId);


@@ -237,7 +235,7 @@ bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
                }
 */
                default:
                }
 */
                default:

-                       return FALSE;
+            return wxWindow::MSWNotify(wParam, lParam, result);

        }
 
     event.SetEventType(eventType);
        }
 
     event.SetEventType(eventType);