Renamed a couple more samples/controls files; fixed wxSplitterWindow cursors

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

diff --git a/samples/controls/controls.def b/samples/controls/controls.def
new file mode 100644 (file)
index 0000000..a6c3f21
--- /dev/null
+++ b/samples/controls/controls.def
@@ -0,0 +1,8 @@
+NAME         Controls
+DESCRIPTION  'wxWindows controls sample'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     4048
+STACKSIZE    16000

diff --git a/samples/controls/controls.rc b/samples/controls/controls.rc
new file mode 100644 (file)
index 0000000..7655c62
--- /dev/null
+++ b/samples/controls/controls.rc
@@ -0,0 +1,3 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+

diff --git a/samples/controls/minimal.def b/samples/controls/minimal.def
deleted file mode 100644 (file)
index 060bfe3..0000000
--- a/samples/controls/minimal.def
+++ /dev/null
@@ -1,8 +0,0 @@
-NAME         Minimal
-DESCRIPTION  'Minimal wxWindows application'
-EXETYPE      WINDOWS
-STUB         'WINSTUB.EXE'
-CODE         PRELOAD MOVEABLE DISCARDABLE
-DATA         PRELOAD MOVEABLE MULTIPLE
-HEAPSIZE     4048
-STACKSIZE    16000

diff --git a/samples/controls/minimal.rc b/samples/controls/minimal.rc
deleted file mode 100644 (file)
index 7655c62..0000000
--- a/samples/controls/minimal.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-mondrian ICON "mondrian.ico"
-#include "wx/msw/wx.rc"
-

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 12b3dda1bca9f5437ad11c05bab1685a3c468c69..7f0ec5df0f93815b35bca7605be4813778434ace 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -173,7 +173,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         m_dragMode = wxSPLIT_DRAG_NONE;
 
         SetCursor(*wxSTANDARD_CURSOR);
         m_dragMode = wxSPLIT_DRAG_NONE;
 
         SetCursor(*wxSTANDARD_CURSOR);

-        wxSetCursor(*wxSTANDARD_CURSOR);

     }
        else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
        {
     }
        else if (event.LeftUp() && m_dragMode == wxSPLIT_DRAG_DRAGGING)
        {


@@ -259,19 +258,15 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                if ( m_splitMode == wxSPLIT_VERTICAL )
                 {
                        SetCursor(*m_sashCursorWE);
                if ( m_splitMode == wxSPLIT_VERTICAL )
                 {
                        SetCursor(*m_sashCursorWE);

-                    // Windows needs the following
-                       wxSetCursor(*m_sashCursorWE);

                 }
                 else
                 {
                        SetCursor(*m_sashCursorNS);
                 }
                 else
                 {
                        SetCursor(*m_sashCursorNS);

-                       wxSetCursor(*m_sashCursorNS);

                 }
         }
         else
         {
            SetCursor(*wxSTANDARD_CURSOR);
                 }
         }
         else
         {
            SetCursor(*wxSTANDARD_CURSOR);

-           wxSetCursor(*wxSTANDARD_CURSOR);

         }
        }
        else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) ||
         }
        }
        else if ( (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) ||


@@ -280,12 +275,10 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
          if ( m_splitMode == wxSPLIT_VERTICAL )
          {
                SetCursor(*m_sashCursorWE);
          if ( m_splitMode == wxSPLIT_VERTICAL )
          {
                SetCursor(*m_sashCursorWE);

-               wxSetCursor(*m_sashCursorWE);

          }
          else
          {
                SetCursor(*m_sashCursorNS);
          }
          else
          {
                SetCursor(*m_sashCursorNS);

-               wxSetCursor(*m_sashCursorNS);

          }
 
         // Detect that this is really a drag: we've moved more than 1 pixel either way
          }
 
         // Detect that this is really a drag: we've moved more than 1 pixel either way


@@ -316,8 +309,6 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     }
     else
     {
     }
     else
     {

-        SetCursor(*wxSTANDARD_CURSOR);
-        wxSetCursor(*wxSTANDARD_CURSOR);

     }
 }
 
     }
 }
 

diff --git a/utils/ogl/distrib/ogl.rsp b/utils/ogl/distrib/ogl.rsp
index 9915234a8dd05f06496bd70e7024fc417de685ff..f7eaa1967c1e6e59af73c68b8debdf142fea6721 100644 (file)
--- a/utils/ogl/distrib/ogl.rsp
+++ b/utils/ogl/distrib/ogl.rsp
@@ -24,8 +24,6 @@ samples/ogledit/bitmaps/*.bmp
 samples/ogledit/bitmaps/*.gif
 samples/ogledit/bitmaps/*.xbm
 
 samples/ogledit/bitmaps/*.gif
 samples/ogledit/bitmaps/*.xbm
 

-lib/dummy
-

 distrib/*.rsp
 distrib/*.bat
 
 distrib/*.rsp
 distrib/*.bat