Initial revision

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

diff --git a/src/msw/slider95.cpp b/src/msw/slider95.cpp
index f9aa9ea5c19413f0cc934caa6a35e0975d8d5267..69af9112696afef235262b108398e1a397bc159c 100644 (file)
--- a/src/msw/slider95.cpp
+++ b/src/msw/slider95.cpp
@@ -22,8 +22,8 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

-#include <wx/utils.h>
-#include <wx/brush.h>
+#include "wx/utils.h"
+#include "wx/brush.h"

 #endif
 
 #ifdef __WIN95__
 #endif
 
 #ifdef __WIN95__


@@ -31,13 +31,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__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)

 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxSlider95, wxControl)

-#endif

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


@@ -60,7 +58,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()) ;


@@ -93,14 +93,14 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
       bool want3D;
       WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
       bool want3D;
       WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 

-      m_staticValue = (WXHWND) CreateWindowEx(exStyle, "STATIC", NULL,
+      m_staticValue = (WXHWND) CreateWindowEx(exStyle, wxT("STATIC"), NULL,

                                msStyle,
                                0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                                wxGetInstance(), NULL);
 
       // Now create min static control
                                msStyle,
                                0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)NewControlId(),
                                wxGetInstance(), NULL);
 
       // Now create min static control

-      sprintf(wxBuffer, "%d", minValue);
-      m_staticMin = (WXHWND) CreateWindowEx(0, "STATIC", wxBuffer,
+      wxSprintf(wxBuffer, wxT("%d"), minValue);
+      m_staticMin = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,

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


@@ -149,15 +149,15 @@ bool wxSlider95::Create(wxWindow *parent, wxWindowID id,
 
   SubclassWin(GetHWND());
 
 
   SubclassWin(GetHWND());
 

-  SetWindowText((HWND) m_hWnd, "");
+  SetWindowText((HWND) m_hWnd, wxT(""));

 
   SetFont(parent->GetFont());
 
   if ( m_windowStyle & wxSL_LABELS )
   {
       // Finally, create max value static item
 
   SetFont(parent->GetFont());
 
   if ( m_windowStyle & wxSL_LABELS )
   {
       // Finally, create max value static item

-      sprintf(wxBuffer, "%d", maxValue);
-      m_staticMax = (WXHWND) CreateWindowEx(0, "STATIC", wxBuffer,
+      wxSprintf(wxBuffer, wxT("%d"), maxValue);
+      m_staticMax = (WXHWND) CreateWindowEx(0, wxT("STATIC"), wxBuffer,

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


@@ -239,7 +239,7 @@ bool wxSlider95::MSWOnScroll(int WXUNUSED(orientation), WXWORD wParam,
             nScrollInc = 0;
     }
 
             nScrollInc = 0;
     }
 

-    if ( nScrollInc == 0 )
+    if (scrollEvent == wxEVT_NULL)

     {
         // no event...
         return FALSE;
     {
         // no event...
         return FALSE;


@@ -277,15 +277,15 @@ wxSlider95::~wxSlider95()
 
 int wxSlider95::GetValue() const
 {
 
 int wxSlider95::GetValue() const
 {

-  return ::SendMessage((HWND) GetHWND(), TBM_GETPOS, 0, 0);
+  return ::SendMessage(GetHwnd(), TBM_GETPOS, 0, 0);

 }
 
 void wxSlider95::SetValue(int value)
 {
 }
 
 void wxSlider95::SetValue(int value)
 {

-  ::SendMessage((HWND) GetHWND(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value);
+  ::SendMessage(GetHwnd(), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)value);

   if (m_staticValue)
   {
   if (m_staticValue)
   {

-    sprintf(wxBuffer, "%d", value);
+    wxSprintf(wxBuffer, wxT("%d"), value);

     SetWindowText((HWND) m_staticValue, wxBuffer);
   }
 }
     SetWindowText((HWND) m_staticValue, wxBuffer);
   }
 }


@@ -344,6 +344,8 @@ void wxSlider95::GetPosition(int *x, int *y) const
   *y = point.y;
 }
 
   *y = point.y;
 }
 

+// TODO one day, make sense of all this horros and replace it with a readable
+//      DoGetBestSize()

 void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;
 void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;


@@ -353,14 +355,14 @@ 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);
 

-  char buf[300];
+  wxChar buf[300];

 
   int x_offset = x;
   int y_offset = y;
 
   int x_offset = x;
   int y_offset = y;


@@ -413,7 +415,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow((HWND) GetHWND(), x_offset, y_offset, slider_length, slider_height, TRUE);
+    MoveWindow(GetHwnd(), x_offset, y_offset, slider_length, slider_height, TRUE);

     x_offset += slider_length + cx;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
     x_offset += slider_length + cx;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);


@@ -430,7 +432,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             w1 = 200;
         if ( h1 < 0 )
             h1 = 20;
             w1 = 200;
         if ( h1 < 0 )
             h1 = 20;

-        MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
+        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);

     }
   }
   else
     }
   }
   else


@@ -479,7 +481,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (slider_length < 100)
       slider_length = 100;
 
     if (slider_length < 100)
       slider_length = 100;
 

-    MoveWindow((HWND) GetHWND(), x_offset, y_offset, slider_width, slider_length, TRUE);
+    MoveWindow(GetHwnd(), x_offset, y_offset, slider_width, slider_length, TRUE);

     y_offset += slider_length;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);
     y_offset += slider_length;
 
     MoveWindow((HWND) m_staticMax, x_offset, y_offset, (int)max_len, cy, TRUE);


@@ -496,7 +498,7 @@ void wxSlider95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
             w1 = 20;
         if ( h1 < 0 )
             h1 = 200;
             w1 = 20;
         if ( h1 < 0 )
             h1 = 200;

-        MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);
+        MoveWindow(GetHwnd(), x1, y1, w1, h1, TRUE);

     }
   }
 }
     }
   }
 }


@@ -506,18 +508,18 @@ void wxSlider95::SetRange(int minValue, int maxValue)
   m_rangeMin = minValue;
   m_rangeMax = maxValue;
 
   m_rangeMin = minValue;
   m_rangeMax = maxValue;
 

-  ::SendMessage((HWND) GetHWND(), TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));
+  ::SendMessage(GetHwnd(), TBM_SETRANGE, TRUE, MAKELONG(minValue, maxValue));

 
 

-  char buf[40];
+  wxChar buf[40];

   if ( m_staticMin )
   {
   if ( m_staticMin )
   {

-      sprintf(buf, "%d", m_rangeMin);
+      wxSprintf(buf, wxT("%d"), m_rangeMin);

       SetWindowText((HWND) m_staticMin, buf);
   }
 
   if ( m_staticMax )
   {
       SetWindowText((HWND) m_staticMin, buf);
   }
 
   if ( m_staticMax )
   {

-    sprintf(buf, "%d", m_rangeMax);
+    wxSprintf(buf, wxT("%d"), m_rangeMax);

     SetWindowText((HWND) m_staticMax, buf);
   }
 }
     SetWindowText((HWND) m_staticMax, buf);
   }
 }


@@ -529,28 +531,19 @@ WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
     return 0;
 
   // Otherwise, it's a static
     return 0;
 
   // Otherwise, it's a static

-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
-
-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
+  return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);

 }
 
 // For trackbars only
 void wxSlider95::SetTickFreq(int n, int pos)
 {
   m_tickFreq = n;
 }
 
 // For trackbars only
 void wxSlider95::SetTickFreq(int n, int pos)
 {
   m_tickFreq = n;

-  ::SendMessage( (HWND) GetHWND(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );
+  ::SendMessage( GetHwnd(), TBM_SETTICFREQ, (WPARAM) n, (LPARAM) pos );

 }
 
 void wxSlider95::SetPageSize(int pageSize)
 {
 }
 
 void wxSlider95::SetPageSize(int pageSize)
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );
+  ::SendMessage( GetHwnd(), TBM_SETPAGESIZE, (WPARAM) 0, (LPARAM) pageSize );

   m_pageSize = pageSize;
 }
 
   m_pageSize = pageSize;
 }
 


@@ -561,53 +554,53 @@ int wxSlider95::GetPageSize() const
 
 void wxSlider95::ClearSel()
 {
 
 void wxSlider95::ClearSel()
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 );
+  ::SendMessage( GetHwnd(), TBM_CLEARSEL, (WPARAM) TRUE, (LPARAM) 0 );

 }
 
 void wxSlider95::ClearTicks()
 {
 }
 
 void wxSlider95::ClearTicks()
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );
+  ::SendMessage( GetHwnd(), TBM_CLEARTICS, (WPARAM) TRUE, (LPARAM) 0 );

 }
 
 void wxSlider95::SetLineSize(int lineSize)
 {
   m_lineSize = lineSize;
 }
 
 void wxSlider95::SetLineSize(int lineSize)
 {
   m_lineSize = lineSize;

-  ::SendMessage( (HWND) GetHWND(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );
+  ::SendMessage( GetHwnd(), TBM_SETLINESIZE, (WPARAM) 0, (LPARAM) lineSize );

 }
 
 int wxSlider95::GetLineSize() const
 {
 }
 
 int wxSlider95::GetLineSize() const
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 );
+  return (int) ::SendMessage( GetHwnd(), TBM_GETLINESIZE, (WPARAM) 0, (LPARAM) 0 );

 }
 
 int wxSlider95::GetSelEnd() const
 {
 }
 
 int wxSlider95::GetSelEnd() const
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 );
+  return (int) ::SendMessage( GetHwnd(), TBM_SETSELEND, (WPARAM) 0, (LPARAM) 0 );

 }
 
 int wxSlider95::GetSelStart() const
 {
 }
 
 int wxSlider95::GetSelStart() const
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );
+  return (int) ::SendMessage( GetHwnd(), TBM_GETSELSTART, (WPARAM) 0, (LPARAM) 0 );

 }
 
 void wxSlider95::SetSelection(int minPos, int maxPos)
 {
 }
 
 void wxSlider95::SetSelection(int minPos, int maxPos)
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETSEL, (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) );
+  ::SendMessage( GetHwnd(), TBM_SETSEL, (WPARAM) TRUE, (LPARAM) MAKELONG( minPos, maxPos) );

 }
 
 void wxSlider95::SetThumbLength(int len)
 {
 }
 
 void wxSlider95::SetThumbLength(int len)
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );
+  ::SendMessage( GetHwnd(), TBM_SETTHUMBLENGTH, (WPARAM) len, (LPARAM) 0 );

 }
 
 int wxSlider95::GetThumbLength() const
 {
 }
 
 int wxSlider95::GetThumbLength() const
 {

-  return (int) ::SendMessage( (HWND) GetHWND(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );
+  return (int) ::SendMessage( GetHwnd(), TBM_GETTHUMBLENGTH, (WPARAM) 0, (LPARAM) 0 );

 }
 
 void wxSlider95::SetTick(int tickPos)
 {
 }
 
 void wxSlider95::SetTick(int tickPos)
 {

-  ::SendMessage( (HWND) GetHWND(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );
+  ::SendMessage( GetHwnd(), TBM_SETTIC, (WPARAM) 0, (LPARAM) tickPos );

 }
 
 bool wxSlider95::ContainsHWND(WXHWND hWnd) const
 }
 
 bool wxSlider95::ContainsHWND(WXHWND hWnd) const