wxUSE_SOCKETS added to setup(0).h; Cygwin corrections; doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
#include "wx/stattext.h"
|
||||
#include "wx/radiobox.h"
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/prntbase.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
|
@@ -447,7 +447,7 @@ void wxMDIChildFrame::OnLower()
|
||||
|
||||
// Set the client size (i.e. leave the calculation of borders etc.
|
||||
// to wxWindows)
|
||||
void wxMDIChildFrame::SetClientSize(int width, int height)
|
||||
void wxMDIChildFrame::DoSetClientSize(int width, int height)
|
||||
{
|
||||
wxWindow::DoSetClientSize(width, height);
|
||||
}
|
||||
|
@@ -44,6 +44,10 @@
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
|
||||
#ifdef __GNUWIN32__
|
||||
#include "wx/msw/gnuwin32/extra.h"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private functions
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -780,7 +780,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hwnd,
|
||||
}
|
||||
|
||||
if ( !processed )
|
||||
return ::CallWindowProc(s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
|
||||
return ::CallWindowProc((WNDPROC) s_wndprocRadioBtn, hwnd, msg, wParam, lParam);
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
@@ -40,6 +40,10 @@
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
|
||||
#ifdef __GNUWIN32__
|
||||
#include "wx/msw/gnuwin32/extra.h"
|
||||
#endif
|
||||
|
||||
#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
|
||||
#include <commctrl.h>
|
||||
#endif
|
||||
|
@@ -1264,6 +1264,12 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
|
||||
// because both usually pop up a context menu
|
||||
case VK_APPS:
|
||||
{
|
||||
|
||||
#ifndef GET_X_LPARAM
|
||||
#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
|
||||
#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
|
||||
#endif
|
||||
|
||||
// construct the key mask
|
||||
WPARAM fwKeys = MK_RBUTTON;
|
||||
if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
|
||||
|
Reference in New Issue
Block a user