Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetCursor() works now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-24 23:48:32 +00:00
parent db2150a19b
commit 1aff8b0241
4 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/msw/app.cpp
View File

@@ -346,7 +346,7 @@ bool wxApp::RegisterWindowClasses()
wndclass2.cbWndExtra = sizeof( DWORD ); // was 4
wndclass2.hInstance = wxhInstance;
wndclass2.hIcon = (HICON) NULL;
wndclass2.hCursor = (HCURSOR) NULL;
wndclass2.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );
// wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;
wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
wndclass2.lpszMenuName = NULL;
@@ -371,7 +371,7 @@ bool wxApp::RegisterWindowClasses()
wndclass3.cbWndExtra = sizeof( DWORD ); // was 4
wndclass3.hInstance = wxhInstance;
wndclass3.hIcon = (HICON) NULL;
wndclass3.hCursor = (HCURSOR) NULL;
wndclass3.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );
// wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;
wndclass3.hbrBackground = (HBRUSH) NULL;
wndclass3.lpszMenuName = NULL;

24
src/msw/radiobox.cpp
View File

@@ -460,12 +460,12 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
// It's a labelled toggle
textRadioButton = wxGetWindowText(m_radioButtons[i]);
GetTextExtent(textRadioButton, &current_width, &cyf,
NULL,NULL, & this->GetFont());
NULL, NULL, &GetFont());
if ( calcWidth )
eachWidth = (int)(current_width + RADIO_SIZE);
eachWidth = current_width + RADIO_SIZE;
if ( calcHeight )
eachHeight = (int)((3*cyf)/2);
eachHeight = (3*cyf)/2;
}
else
{
@@ -500,7 +500,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
totHeight = nbVer * (maxHeight+cy1/2) ;
totWidth = nbHor * (maxWidth+cx1) ;
#if (!wxUSE_CTL3D)
#if !defined(__WIN32__) && (!wxUSE_CTL3D)
// Requires a bigger group box in plain Windows
MoveWindow((HWND) m_hWnd,x_offset,y_offset,totWidth+cx1,totHeight+(3*cy1)/2,TRUE) ;
#else
@@ -510,7 +510,7 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
y_offset += cy1;
}
#if (!wxUSE_CTL3D)
#if !defined(__WIN32__) && (!wxUSE_CTL3D)
y_offset += (int)(cy1/2); // Fudge factor since buttons overlapped label
// JACS 2/12/93. CTL3D draws group label quite high.
#endif
@@ -535,8 +535,10 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
y_offset += cy1/2 ;
}
}
int eachWidth;
int eachHeight;
if ( m_radioWidth[i] < 0 )
{
// It's a labeled item
@@ -544,10 +546,8 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
GetTextExtent(textRadioButton, &current_width, &cyf,
NULL,NULL, & this->GetFont());
// How do we find out radio button bitmap size!!
// By adjusting them carefully, manually :-)
eachWidth = (int)(current_width + RADIO_SIZE);
eachHeight = (int)((3*cyf)/2);
eachWidth = current_width + RADIO_SIZE;
eachHeight = (3*cyf)/2;
}
else
{
@@ -555,7 +555,9 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
eachHeight = m_radioHeight[i] ;
}
MoveWindow((HWND) m_radioButtons[i],x_offset,y_offset,eachWidth,eachHeight,TRUE);
MoveWindow((HWND)m_radioButtons[i], x_offset, y_offset,
eachWidth,eachHeight,TRUE);
if ( m_windowStyle & wxRA_VERTICAL )
if (m_windowStyle & wxRA_SPECIFY_ROWS)
{
y_offset += maxHeight;
@@ -563,9 +565,11 @@ void wxRadioBox::SetSize(int x, int y, int width, int height, int sizeFlags)
y_offset += cy1/2 ;
}
else
{
x_offset += maxWidth + cx1;
}
}
}
#endif
// Restored old code.

1
src/msw/utils.cpp
View File

@@ -537,7 +537,6 @@ void wxEndBusyCursor()
wxCHECK_RET( gs_wxBusyCursorCount > 0,
"no matching wxBeginBusyCursor() for wxEndBusyCursor()" );
gs_wxBusyCursorCount--;
if ( --gs_wxBusyCursorCount == 0 )
{
::SetCursor(gs_wxBusyCursorOld);

21
src/msw/window.cpp
View File

@@ -239,7 +239,6 @@ void wxWindow::Init()
m_windowStyle = 0;
m_windowParent = NULL;
m_windowEventHandler = this;
m_windowCursor = *wxSTANDARD_CURSOR;
m_children = new wxList;
m_doubleClickAllowed = 0 ;
m_winCaptured = FALSE;
@@ -1486,6 +1485,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
return MSWGetDlgCode();
case WM_SETCURSOR:
{
// don't set cursor when the mouse is not in the client part
short nHitTest = LOWORD(lParam);
if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
{
HCURSOR hcursor = 0;
if ( wxIsBusy() )
@@ -1494,6 +1497,10 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
hcursor = gs_wxBusyCursor;
}
else if ( m_windowCursor.Ok() )
{
hcursor = (HCURSOR)m_windowCursor.GetHCURSOR();
}
else
{
extern wxCursor *g_globalCursor; // from msw\data.cpp
@@ -1507,13 +1514,14 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
::SetCursor(hcursor);
// returning TRUE stops the DefWindowProc() from further
// processing this message - exactly what we need because we've
// just set the cursor
// processing this message - exactly what we need because
// we've just set the cursor
return TRUE;
}
}
}
break; // leave it to DefWindowProc()
return MSWDefWindowProc(message, wParam, lParam );
default:
return MSWDefWindowProc(message, wParam, lParam );
@@ -2429,11 +2437,6 @@ void wxWindow::MSWOnRButtonDClick(int x, int y, WXUINT flags)
void wxWindow::MSWOnMouseMove(int x, int y, WXUINT flags)
{
// 'normal' move event...
// Set cursor, but only if we're not in 'busy' mode
// Trouble with this is that it sets the cursor for controls too :-(
if (m_windowCursor.Ok() && !wxIsBusy())
::SetCursor((HCURSOR) m_windowCursor.GetHCURSOR());
if (!m_mouseInWindow)
{