From e2b34251cba8fd13818d99d04a336bd16126d44a Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 23 Nov 1999 10:53:39 +0000 Subject: [PATCH] WM_MOUSEMOVE correction git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/treectrl.tex | 28 ++++++++++++++++------------ include/wx/msw/setup0.h | 2 -- samples/wxsocket/makefile.g95 | 4 ++-- src/msw/bitmap.cpp | 11 ++++++++++- src/msw/makefile.vc | 2 +- src/msw/window.cpp | 7 +++++++ 6 files changed, 36 insertions(+), 18 deletions(-) diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex index 67e6009640..fad69db3bf 100644 --- a/docs/latex/wx/treectrl.tex +++ b/docs/latex/wx/treectrl.tex @@ -255,16 +255,9 @@ Returns the first visible item. \membersection{wxTreeCtrl::GetImageList}\label{wxtreectrlgetimagelist} -\constfunc{wxImageList*}{GetImageList}{\param{int }{which = wxIMAGE\_LIST\_NORMAL}} +\constfunc{wxImageList*}{GetImageList}{\void} -Returns the specified image list. {\it which} may be one of: - -\twocolwidtha{5cm} -\begin{twocollist}\itemsep=0pt -\twocolitem{\windowstyle{wxIMAGE\_LIST\_NORMAL}}{The normal (large icon) image list.} -\twocolitem{\windowstyle{wxIMAGE\_LIST\_SMALL}}{The small icon image list.} -\twocolitem{\windowstyle{wxIMAGE\_LIST\_STATE}}{The user-defined state image list (unimplemented).} -\end{twocollist} +Returns the normal image list. \membersection{wxTreeCtrl::GetIndent}\label{wxtreectrlgetindent} @@ -420,6 +413,12 @@ Returns the number of selected items. \pythonnote{The wxPython version of this method accepts no parameters and returns a Python list of \tt{wxTreeItemId}'s.} +\membersection{wxTreeCtrl::GetStateImageList}\label{wxtreectrlgetstateimagelist} + +\constfunc{wxImageList*}{GetStateImageList}{\void} + +Returns the state image list (from which application-defined state images are taken). + \membersection{wxTreeCtrl::HitTest}\label{wxtreectrlhittest} \func{long}{HitTest}{\param{const wxPoint\& }{point}, \param{int\& }{flags}} @@ -527,10 +526,9 @@ Sets the indentation for the tree control. \membersection{wxTreeCtrl::SetImageList}\label{wxtreectrlsetimagelist} -\func{void}{SetImageList}{\param{wxImageList*}{ imageList}, \param{int }{which = wxIMAGE\_LIST\_NORMAL}} +\func{void}{SetImageList}{\param{wxImageList*}{ imageList}} -Sets the image list. {\it which} should be one of wxIMAGE\_LIST\_NORMAL, wxIMAGE\_LIST\_SMALL and -wxIMAGE\_LIST\_STATE. +Sets the normal image list. \membersection{wxTreeCtrl::SetItemBold}\label{wxtreectrlsetitembold} @@ -585,6 +583,12 @@ Sets the selected item image (this function is obsolete, use Sets the item label. +\membersection{wxTreeCtrl::SetStateImageList}\label{wxtreectrlsetstateimagelist} + +\func{void}{SetStateImageList}{\param{wxImageList*}{ imageList}} + +Sets the state image list (from which application-defined state images are taken). + \membersection{wxTreeCtrl::SortChildren}\label{wxtreectrlsortchildren} \func{void}{SortChildren}{\param{const wxTreeItemId\&}{ item}} diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 5c940c1476..734adc7459 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -62,8 +62,6 @@ #define wxUSE_DRAG_AND_DROP 1 // 0 for no drag and drop -#define wxUSE_TOOLBAR 1 - // Define 1 to use toolbar classes #define wxUSE_BUTTONBAR 1 // Define 1 to use buttonbar classes (enhanced toolbar // for MS Windows) diff --git a/samples/wxsocket/makefile.g95 b/samples/wxsocket/makefile.g95 index 8139390064..4d1b5983be 100644 --- a/samples/wxsocket/makefile.g95 +++ b/samples/wxsocket/makefile.g95 @@ -27,13 +27,13 @@ $(OBJDIR): server$(GUISUFFIX): $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(WXLIB) $(CC) $(LDFLAGS) -o server$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/server.$(OBJSUFF) $(OBJDIR)/server_resources.$(OBJSUFF) $(LDLIBS) -$(OBJDIR)/server.$(OBJSUFF): server.$(SRCSUFF) server.h +$(OBJDIR)/server.$(OBJSUFF): server.$(SRCSUFF) $(CC) -c $(CPPFLAGS) -o $@ server.$(SRCSUFF) client$(GUISUFFIX): $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(WXLIB) $(CC) $(LDFLAGS) -o client$(GUISUFFIX)$(EXESUFF) $(OBJDIR)/client.$(OBJSUFF) $(OBJDIR)/client_resources.$(OBJSUFF) $(LDLIBS) -$(OBJDIR)/client.$(OBJSUFF): client.$(SRCSUFF) client.h +$(OBJDIR)/client.$(OBJSUFF): client.$(SRCSUFF) $(CC) -c $(CPPFLAGS) -o $@ client.$(SRCSUFF) $(OBJDIR)/server_resources.o: server.rc diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index ab37c081e3..7579bcee53 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -278,6 +278,10 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) wxBitmapHandler *handler = FindHandler(type); +#if 0 + if ( handler == NULL ) + return FALSE; +#else if ( handler == NULL ) { wxImage image; if (!image.LoadFile( filename, type )) return FALSE; @@ -288,7 +292,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) } else return FALSE; } - +#endif return handler->LoadFile(this, filename, type, -1, -1); } @@ -313,11 +317,16 @@ bool wxBitmap::SaveFile(const wxString& filename, int type, const wxPalette *pal { wxBitmapHandler *handler = FindHandler(type); +#if 0 + if ( handler == NULL ) + return FALSE; +#else if ( handler == NULL ) { // try wxImage wxImage image( *this ); if (image.Ok()) return image.SaveFile( filename, type ); else return FALSE; } +#endif return handler->SaveFile(this, filename, type, palette); } diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc index 6d7c6ebc81..1d31f29421 100644 --- a/src/msw/makefile.vc +++ b/src/msw/makefile.vc @@ -283,7 +283,6 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\palette.obj \ ..\msw\$D\pen.obj \ ..\msw\$D\penwin.obj \ - ..\msw\$D\pnghand.obj \ ..\msw\$D\printdlg.obj \ ..\msw\$D\printwin.obj \ ..\msw\$D\radiobox.obj \ @@ -309,6 +308,7 @@ MSWOBJS = ..\msw\$D\accel.obj \ ..\msw\$D\timer.obj \ ..\msw\$D\tooltip.obj \ ..\msw\$D\treectrl.obj \ + ..\msw\$D\pnghand.obj \ ..\msw\$D\utils.obj \ ..\msw\$D\utilsexc.obj \ ..\msw\ole\$D\uuid.obj \ diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 3a49e008d6..cb7ceddbda 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -1836,6 +1836,13 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) break; case WM_MOUSEMOVE: + { + short x = LOWORD(lParam); + short y = HIWORD(lParam); + + processed = HandleMouseMove(x, y, wParam); + break; + } case WM_LBUTTONDOWN: case WM_LBUTTONUP: case WM_LBUTTONDBLCLK: