if (event.LeftDown())
{
+ CaptureMouse();
+
if ( sashHit != wxSASH_NONE )
{
- CaptureMouse();
-
// Required for X to specify that
// that we wish to draw on top of all windows
// - and we optimise by specifying the area
m_draggingEdge = sashHit;
m_firstX = x;
m_firstY = y;
+
+ if ( (sashHit == wxSASH_LEFT) || (sashHit == wxSASH_RIGHT) )
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ else
+ {
+ SetCursor(*m_sashCursorNS);
+ }
}
}
else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )
event.SetDragRect(dragRect);
GetEventHandler()->ProcessEvent(event);
}
+ else if ( event.LeftUp() )
+ {
+ ReleaseMouse();
+ }
else if (event.Moving() && !event.Dragging())
{
// Just change the cursor if required
m_oldX = x;
m_oldY = y;
+
+ if ( m_splitMode == wxSPLIT_VERTICAL )
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ else
+ {
+ SetCursor(*m_sashCursorNS);
+ }
return;
}
}
}
else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
{
+#ifdef __WXMSW__
+ // Otherwise, the cursor sometimes reverts to the normal cursor
+ // during dragging.
+ if ( m_splitMode == wxSPLIT_VERTICAL )
+ {
+ SetCursor(*m_sashCursorWE);
+ }
+ else
+ {
+ SetCursor(*m_sashCursorNS);
+ }
+#endif
+
// Obtain window size. We are only interested in the dimension the sash
// splits up
int new_sash_position =
# If using Cygwin, set this to 0.
# If using Mingw32, set this to 1.
-MINGW32=1
+MINGW32=0
# Set to the version you have
MINGW32VERSION=2.95
RM=rm -f
# Set to the appropriate copy command
+# Some possible alternatives:
+# COPY=cp and COPYSEP=/
+# COPY=copy and COPYSEP=\
+#
COPY=copy
+COPYSEP=\
# Cross compiling? Provide the target prefix (eg., i386-mingw32-)
# CROSS=i386-mingw32-
RCOUTPUTSWITCH=-o
RCINCSWITCH=--include-dir
RCDEFSWITCH=--define
-RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
+# Note that this can cause windres to fail (Win95/98 problem?)
+# but commenting out RCPREPROCESSOR then does the trick.
+#RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
# End Source File
# Begin Source File
-SOURCE=.\generic\gridg.cpp
+SOURCE=.\generic\grid.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\html\m_fonts.cpp
+SOURCE=.\html\m_dflist.cpp
# End Source File
# Begin Source File
-SOURCE=.\html\m_meta.cpp
+SOURCE=.\html\m_fonts.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\html\m_dflist.cpp
+SOURCE=.\html\m_meta.cpp
# End Source File
# Begin Source File
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\xpm\crbuffri.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\attrib.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\crbuffrp.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\crbuffri.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\crdatfri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfrp.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\create.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\crifrbuf.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\crifrdat.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\crpfrbuf.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\dataxpm.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\crpfrdat.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\hashtab.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\dataxpm.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\imagexpm.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\hashtab.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\info.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\misc.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\parse.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\rdftodat.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\rdftoi.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftop.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\rgb.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\scan.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\simx.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\wrffrdat.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\wrffri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrp.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
# End Source File
# Begin Source File
-SOURCE=.\generic\gridg.cpp
+SOURCE=.\generic\grid.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=.\html\m_meta.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\html\m_fonts.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
+SOURCE=.\html\m_meta.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\html\m_pre.cpp
# End Source File
# Begin Source File
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\xpm\crbuffri.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\attrib.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\crbuffrp.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\crbuffri.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\crdatfri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\crdatfrp.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\create.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\crifrbuf.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\crifrdat.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\crpfrbuf.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\dataxpm.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\crpfrdat.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\hashtab.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\dataxpm.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\imagexpm.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
-SOURCE=.\xpm\hashtab.c
-# ADD CPP /D "FOR_MSW"
+SOURCE=.\xpm\info.c
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\misc.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\parse.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\rdftodat.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\rdftoi.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\rdftop.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\rgb.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\scan.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\simx.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\wrffrdat.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# Begin Source File
SOURCE=.\xpm\wrffri.c
-# ADD CPP /D "FOR_MSW"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\xpm\wrffrp.c
-# ADD CPP /D "FOR_MSW"
# SUBTRACT CPP /YX /Yc /Yu
# End Source File
# End Group
projects / wxWidgets.git / commitdiff
