implemented menu drawing in the GTK theme

[wxWidgets.git] / src / msw / slider95.cpp

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index 10a12ac3efe3733a8cd21d80ba38f022303b2812..e72bb09b172b3f4338a75a70059c624fe36724cc 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:       wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,10 +20,12 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SLIDER
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>

 #include "wx/utils.h"
 #include "wx/brush.h"
 #include "wx/utils.h"
 #include "wx/brush.h"

+#include "wx/slider.h"

 #endif
 
 #ifdef __WIN95__
 #endif
 
 #ifdef __WIN95__


@@ -31,11 +33,11 @@
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/slider95.h"
 #include "wx/msw/private.h"
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+    #include <commctrl.h>

 #endif
 
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)

 
 // Slider
 wxSlider95::wxSlider95()
 
 // Slider
 wxSlider95::wxSlider95()


@@ -58,7 +60,9 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
   SetName(name);
            const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
 
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;


@@ -82,11 +86,15 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
   int width = size.x;
   int height = size.y;
 
   int width = size.x;
   int height = size.y;
 

-  long msStyle ;
+  long msStyle=0 ;
+  long wstyle=0 ;
+
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+    msStyle |= WS_CLIPSIBLINGS;

 
   if ( m_windowStyle & wxSL_LABELS )
   {
 
   if ( m_windowStyle & wxSL_LABELS )
   {

-      msStyle = WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;
+      msStyle |= WS_CHILD | WS_VISIBLE | WS_BORDER | SS_CENTER;

 
       bool want3D;
       WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
       bool want3D;
       WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;


@@ -98,13 +106,20 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
       // Now create min static control
       wxSprintf(wxBuffer, wxT("%d"), minValue);
 
       // Now create min static control
       wxSprintf(wxBuffer, wxT("%d"), minValue);

+      wstyle = STATIC_FLAGS;
+      if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;

       m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
       m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,

-                             STATIC_FLAGS,
+                             wstyle,

                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
   }
 
   msStyle = 0;
                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
   }
 
   msStyle = 0;

+
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+    msStyle |= WS_CLIPSIBLINGS;
+

   if (m_windowStyle & wxSL_VERTICAL)
     msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
   else
   if (m_windowStyle & wxSL_VERTICAL)
     msStyle = TBS_VERT | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
   else


@@ -155,8 +170,11 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
   {
       // Finally, create max value static item
       wxSprintf(wxBuffer, wxT("%d"), maxValue);
   {
       // Finally, create max value static item
       wxSprintf(wxBuffer, wxT("%d"), maxValue);

+      wstyle = STATIC_FLAGS;
+      if ( m_windowStyle & wxCLIP_SIBLINGS )
+        msStyle |= WS_CLIPSIBLINGS;

       m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,
       m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,

-                             STATIC_FLAGS,
+                             wstyle,

                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
 
                              0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                              wxGetInstance(), NULL);
 


@@ -185,62 +203,43 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
 }
 
 bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,

-                             WXWORD pos, WXHWND control)
+                             WXWORD WXUNUSED(pos), WXHWND control)

 {
 {

-    int position = 0; // Dummy - not used in this mode
-
-    int nScrollInc;
-    wxEventType scrollEvent = wxEVT_NULL;
+    wxEventType scrollEvent;

     switch ( wParam )
     {
         case SB_TOP:
     switch ( wParam )
     {
         case SB_TOP:

-            nScrollInc = m_rangeMax - position;

             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
         case SB_BOTTOM:
             scrollEvent = wxEVT_SCROLL_TOP;
             break;
 
         case SB_BOTTOM:

-            nScrollInc = - position;

             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:
             scrollEvent = wxEVT_SCROLL_BOTTOM;
             break;
 
         case SB_LINEUP:

-            nScrollInc = - GetLineSize();

             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:
             scrollEvent = wxEVT_SCROLL_LINEUP;
             break;
 
         case SB_LINEDOWN:

-            nScrollInc = GetLineSize();

             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:
             scrollEvent = wxEVT_SCROLL_LINEDOWN;
             break;
 
         case SB_PAGEUP:

-            nScrollInc = -GetPageSize();

             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:
             scrollEvent = wxEVT_SCROLL_PAGEUP;
             break;
 
         case SB_PAGEDOWN:

-            nScrollInc = GetPageSize();

             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBTRACK:
         case SB_THUMBPOSITION:
             scrollEvent = wxEVT_SCROLL_PAGEDOWN;
             break;
 
         case SB_THUMBTRACK:
         case SB_THUMBPOSITION:

-#ifdef __WIN32__
-            nScrollInc = (signed short)pos - position;
-#else // Win16
-            nScrollInc = pos - position;
-#endif // Win32/16

             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 
         default:
             scrollEvent = wxEVT_SCROLL_THUMBTRACK;
             break;
 
         default:

-            nScrollInc = 0;
-    }
-
-    if (scrollEvent == wxEVT_NULL)
-    {
-        // no event...
-        return FALSE;
+            // unknown scroll event?
+            return FALSE;

     }
 
     int newPos = (int)::SendMessage((HWND) control, TBM_GETPOS, 0, 0);
     }
 
     int newPos = (int)::SendMessage((HWND) control, TBM_GETPOS, 0, 0);


@@ -258,6 +257,7 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
     GetEventHandler()->ProcessEvent(event);
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );
     GetEventHandler()->ProcessEvent(event);
 
     wxCommandEvent cevent( wxEVT_COMMAND_SLIDER_UPDATED, GetId() );

+    cevent.SetInt( newPos );

     cevent.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent( cevent );
     cevent.SetEventObject( this );
 
     return GetEventHandler()->ProcessEvent( cevent );


@@ -353,9 +353,9 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 
   int currentX, currentY;
   GetPosition(&currentX, &currentY);

-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (x == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     x1 = currentX;
     x1 = currentX;

-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
+  if (y == -1 && !(sizeFlags & wxSIZE_ALLOW_MINUS_ONE))

     y1 = currentY;
 
   AdjustForParentClientOrigin(x1, y1, sizeFlags);
     y1 = currentY;
 
   AdjustForParentClientOrigin(x1, y1, sizeFlags);


@@ -634,3 +634,4 @@ bool wxSlider95::Show(bool show)
 #endif
   // __WIN95__
 
 #endif
   // __WIN95__
 

+#endif // wxUSE_SLIDER