SN: Disable some features not supported by EMX (#ifndef __EMX__)

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

diff --git a/src/msw/slidrmsw.cpp b/src/msw/slidrmsw.cpp
index 2ec3e8536e0c5283eb37b5896ab113a5ae2c212a..7aa2ccfe031fc7b6a3bdbbc785f47cc10733f28f 100644 (file)
--- a/src/msw/slidrmsw.cpp
+++ b/src/msw/slidrmsw.cpp
@@ -29,9 +29,7 @@
 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 
 #include "wx/msw/slidrmsw.h"
 #include "wx/msw/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxSliderMSW, wxControl)

-#endif

 
 // Slider
 wxSliderMSW::wxSliderMSW()
 
 // Slider
 wxSliderMSW::wxSliderMSW()


@@ -54,7 +52,9 @@ bool wxSliderMSW::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()) ;


@@ -85,14 +85,14 @@ bool wxSliderMSW::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);


@@ -106,7 +106,7 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 
   else
     msStyle = SBS_HORZ | WS_CHILD | WS_VISIBLE | WS_TABSTOP ;
 

-  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), "SCROLLBAR", wxBuffer,
+  HWND scroll_bar = CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("SCROLLBAR"), wxBuffer,

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


@@ -125,8 +125,8 @@ bool wxSliderMSW::Create(wxWindow *parent, wxWindowID id,
   SubclassWin(GetHWND());
 
   // Finally, create max value static item
   SubclassWin(GetHWND());
 
   // 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);


@@ -248,15 +248,15 @@ wxSliderMSW::~wxSliderMSW()
 
 int wxSliderMSW::GetValue() const
 {
 
 int wxSliderMSW::GetValue() const
 {

-  return ::GetScrollPos((HWND) GetHWND(), SB_CTL);
+  return ::GetScrollPos(GetHwnd(), SB_CTL);

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

-  ::SetScrollPos((HWND) GetHWND(), SB_CTL, value, TRUE);
+  ::SetScrollPos(GetHwnd(), SB_CTL, value, TRUE);

   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);
   }
 }


@@ -315,6 +315,8 @@ void wxSliderMSW::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 wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;
 void wxSliderMSW::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   int x1 = x;


@@ -324,14 +326,14 @@ void wxSliderMSW::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;


@@ -379,7 +381,7 @@ void wxSliderMSW::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);


@@ -391,7 +393,7 @@ void wxSliderMSW::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


@@ -435,7 +437,7 @@ void wxSliderMSW::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);


@@ -447,7 +449,7 @@ void wxSliderMSW::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);

     }
   }
 }
     }
   }
 }


@@ -457,17 +459,17 @@ void wxSliderMSW::SetRange(int minValue, int maxValue)
   m_rangeMin = minValue;
   m_rangeMax = maxValue;
 
   m_rangeMin = minValue;
   m_rangeMax = maxValue;
 

-  ::SetScrollRange((HWND) GetHWND(), SB_CTL, m_rangeMin, m_rangeMax, TRUE);
-  char buf[40];
+  ::SetScrollRange(GetHwnd(), SB_CTL, m_rangeMin, m_rangeMax, TRUE);
+  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);
   }
 }


@@ -479,17 +481,7 @@ WXHBRUSH wxSliderMSW::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
 }
 
 // For trackbars only