VC++ project file updates; minor sashwindow/splitterwindow cursor mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index 5f4aac2abe4b18e25aaf50f11df2f1f0a04e5b6e..b326c0caee146038ca7150f65bcbc2da27c98a0f 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -120,10 +120,10 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
 
     if (event.LeftDown())
     {
 
     if (event.LeftDown())
     {

+        CaptureMouse();
+

         if ( sashHit != wxSASH_NONE )
         {
         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
             // Required for X to specify that
             // that we wish to draw on top of all windows
             // - and we optimise by specifying the area


@@ -145,6 +145,15 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
             m_draggingEdge = sashHit;
             m_firstX = x;
             m_firstY = y;
             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 )
         }
     }
     else if ( event.LeftUp() && m_dragMode == wxSASH_DRAG_LEFT_DOWN )


@@ -277,6 +286,10 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);
     }
         event.SetDragRect(dragRect);
         GetEventHandler()->ProcessEvent(event);
     }

+    else if ( event.LeftUp() )
+    {
+        ReleaseMouse();
+    }

     else if (event.Moving() && !event.Dragging())
     {
         // Just change the cursor if required
     else if (event.Moving() && !event.Dragging())
     {
         // Just change the cursor if required

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 31aea495e1752f47834d36b9b3d2c3ab727d269f..6950009cb04e290edb236e92fb8f9ebd38c0c86c 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -189,6 +189,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
 
             m_oldX = x;
             m_oldY = y;
 
             m_oldX = x;
             m_oldY = y;

+
+            if ( m_splitMode == wxSPLIT_VERTICAL )
+            {
+                SetCursor(*m_sashCursorWE);
+            }
+            else
+            {
+                SetCursor(*m_sashCursorNS);
+            }

             return;
         }
     }
             return;
         }
     }


@@ -282,6 +291,19 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
     else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))
     {
     }
     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 =
         // Obtain window size. We are only interested in the dimension the sash
         // splits up
         int new_sash_position =

diff --git a/src/makeg95.env b/src/makeg95.env
index 390f8bb9312c1762438e997985f32a912f9c8a6e..b39b7c1c9da0b1318fa675b5a2ae20a242212912 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -10,7 +10,7 @@
 
 # If using Cygwin, set this to 0.
 # If using Mingw32, set this to 1.
 
 # 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
 
 # Set to the version you have
 MINGW32VERSION=2.95


@@ -28,7 +28,12 @@ LD_SUPPORTS_SHARED=yes
 RM=rm -f 
 
 # Set to the appropriate copy command
 RM=rm -f 
 
 # Set to the appropriate copy command

+# Some possible alternatives:
+# COPY=cp and COPYSEP=/
+# COPY=copy and COPYSEP=\
+#

 COPY=copy
 COPY=copy

+COPYSEP=\

 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-
 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-


@@ -71,7 +76,9 @@ RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
 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__
 
 
 RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 2e647b95fc61bde41b71daa96ecdad7b9a04bd43..07077822db2a286bac20bc5cf554205e1d1f86f2 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -508,7 +508,7 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
 # 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
 


@@ -632,11 +632,11 @@ SOURCE=.\html\htmprint.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
 
 # 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
 


@@ -660,7 +660,7 @@ SOURCE=.\html\m_list.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
 
 # End Source File
 # Begin Source File
 


@@ -1197,134 +1197,97 @@ SOURCE=.\png\pngwutil.c
 # PROP Default_Filter ""
 # 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
 
 # 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
 # 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
 # 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
 # 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
 # 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
 
 # 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
 
 # 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
 
 # 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
 
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 0450bbdfbac673d22939661d9ee92da255dfc3d7..36ae88b436ed8c18eeda1c46c3f3bd6b5b4cf8c7 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -510,7 +510,7 @@ SOURCE=.\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
 
 # 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
 


@@ -634,10 +634,6 @@ SOURCE=.\html\m_dflist.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
 SOURCE=.\html\m_fonts.cpp
 # End Source File
 # Begin Source File


@@ -662,6 +658,10 @@ SOURCE=.\html\m_list.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
 SOURCE=.\html\m_pre.cpp
 # End Source File
 # Begin Source File


@@ -1193,134 +1193,97 @@ SOURCE=.\png\pngwutil.c
 # PROP Default_Filter ""
 # 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
 
 # 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
 # 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
 # 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
 # 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
 # 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
 
 # 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
 
 # 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
 
 # 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
 
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # 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
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # End Group