unused message removed from event table

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

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index 8d4f4b718d58e65abc8b24abc3d9b64fbac295b6..72c54d7704154a39ff51dcc1d91b3b848263935a 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);
   }
 }


@@ -185,7 +188,8 @@ long wxControl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 
   return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
 }
 

-bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam,
+                          WXLPARAM* result)

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


@@ -235,18 +239,18 @@ bool wxControl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
                        break;
                }
 */
                        break;
                }
 */

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

        }
        }

+

     event.SetEventType(eventType);
        event.SetEventObject(this);
 
        if ( !GetEventHandler()->ProcessEvent(event) )
                return FALSE;
        return TRUE;
     event.SetEventType(eventType);
        event.SetEventObject(this);
 
        if ( !GetEventHandler()->ProcessEvent(event) )
                return FALSE;
        return TRUE;

-#else
-  return FALSE;
+#else   // !Win95
+    return FALSE;

 #endif
 }
 
 #endif
 }