Enable variadic macros for VC9 and later.

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 31886a93ef4326f347a38c6e923652e9e5618542..f61c8f5f0cbda0cd63003e6027e284d205da5072 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -239,11 +239,6 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 // wxFrame: various geometry-related functions
 // ----------------------------------------------------------------------------
 
 // wxFrame: various geometry-related functions
 // ----------------------------------------------------------------------------
 

-void wxFrame::Raise()
-{
-    ::SetForegroundWindow(GetHwnd());
-}
-

 // generate an artificial resize event
 void wxFrame::SendSizeEvent(int flags)
 {
 // generate an artificial resize event
 void wxFrame::SendSizeEvent(int flags)
 {


@@ -385,7 +380,7 @@ void wxFrame::AttachMenuBar(wxMenuBar *menubar)
         // adjust for menu / titlebar height
         rc.bottom -= (2*menuHeight-1);
 
         // adjust for menu / titlebar height
         rc.bottom -= (2*menuHeight-1);
 

-        ::MoveWindow(Gethwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);
+        ::MoveWindow(GetHwnd(), rc.left, rc.top, rc.right, rc.bottom, FALSE);

     }
 #endif
 
     }
 #endif
 


@@ -859,7 +854,7 @@ bool
 wxFrame::DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup)
 {
     wxMenuEvent event(evtType, popup ? wxID_ANY : 0, menu);
 wxFrame::DoSendMenuOpenCloseEvent(wxEventType evtType, wxMenu* menu, bool popup)
 {
     wxMenuEvent event(evtType, popup ? wxID_ANY : 0, menu);

-    event.SetEventObject(this);
+    event.SetEventObject(menu);

 
     return HandleWindowEvent(event);
 }
 
     return HandleWindowEvent(event);
 }