wxDocManager gets the only view if none other specified as the current view;

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index bfa74f9f0bc7dd90c8a7c5346a1fac28591f328b..ce22737cb54c186b025b1fd91e537e1c7e42118b 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -98,7 +98,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
 
 BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
   EVT_CHAR(wxWindow::OnChar)
-  EVT_SIZE(wxWindow::OnSize)
   EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
   EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
   EVT_INIT_DIALOG(wxWindow::OnInitDialog)
@@ -808,7 +807,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
   if (fontToUse && fontToUse->Ok())
   {
     if ((fnt=(HFONT) fontToUse->GetResourceHandle()))
-      was = SelectObject(dc,fnt) ;
+      was = (HFONT) SelectObject(dc,fnt) ;
   }
 
   SIZE sizeRect;
@@ -1687,7 +1686,7 @@ void wxWindow::MSWOnDropFiles(WXWPARAM wParam)
   wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd);
 #endif
 
-  HANDLE hFilesInfo = (HANDLE)wParam;
+  HDROP hFilesInfo = (HDROP) wParam;
   POINT dropPoint;
   DragQueryPoint(hFilesInfo, (LPPOINT) &dropPoint);
 
@@ -2648,7 +2647,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font)
 //    the_font->UseResource();
 //    the_font->RealizeResource();
     if ((fnt=(HFONT) the_font->GetResourceHandle()))
-      was = SelectObject(dc,fnt) ;
+      was = (HFONT) SelectObject(dc,fnt) ;
   }
   GetTextMetrics(dc, &tm);
   if (the_font && fnt && was)
@@ -3447,15 +3446,6 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
                ::ScrollWindow((HWND) GetHWND(), dx, dy, NULL, NULL);
 }
 
-void wxWindow::OnSize(wxSizeEvent& event)
-{
-       Default();
-#if USE_CONSTRAINTS
-  if (GetAutoLayout())
-    Layout();
-#endif
-}
-
 /*
 void wxWindow::CalcScrolledPosition(int x, int y, int *xx, int *yy) const
 {
@@ -4355,7 +4345,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
   if (vert_units)
         y_pages = (int)(v_height/vert_units) - y_page;
 
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
   int y = 0;
 #else
   int y = y_page-1;