linking fixes

[wxWidgets.git] / src / os2 / scrolbar.cpp

diff --git a/src/os2/scrolbar.cpp b/src/os2/scrolbar.cpp
index 54df1811666b81aea8a5c83c27507e8fd2250ee8..e77bcbdb26b19e97df9d23d8f7db9f9b7dad6f79 100644 (file)
--- a/src/os2/scrolbar.cpp
+++ b/src/os2/scrolbar.cpp
@@ -1,46 +1,97 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.cpp
 // Purpose:     wxScrollBar
 /////////////////////////////////////////////////////////////////////////////
 // Name:        scrolbar.cpp
 // Purpose:     wxScrollBar

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/15/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "scrolbar.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include "wx/defs.h"
+#include "wx/utils.h"

 #endif
 
 #include "wx/scrolbar.h"
 #endif
 
 #include "wx/scrolbar.h"

+#include "wx/os2/private.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
 

+BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
+#if WXWIN_COMPATIBILITY
+  EVT_SCROLL(wxScrollBar::OnScroll)

 #endif
 #endif

+END_EVENT_TABLE()
+

 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size, long style,
 
 // Scrollbar
 bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size, long style,

+#if wxUSE_VALIDATORS

            const wxValidator& validator,
            const wxValidator& validator,

+#endif

            const wxString& name)
 {
     if (!parent)
         return FALSE;
     parent->AddChild(this);
     SetName(name);
            const wxString& name)
 {
     if (!parent)
         return FALSE;
     parent->AddChild(this);
     SetName(name);

-       SetValidator(validator);
-    
+#if wxUSE_VALIDATORS
+    SetValidator(validator);
+#endif
+
+    SetBackgroundColour(parent->GetBackgroundColour()) ;
+    SetForegroundColour(parent->GetForegroundColour()) ;

     m_windowStyle = style;
 
     if ( id == -1 )
     m_windowStyle = style;
 
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;
+
+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
+
+    if (width == -1)
+    {
+        if (style & wxHORIZONTAL)
+            width = 140;
+        else
+            width = 14;
+    }
+    if (height == -1)
+    {
+        if (style & wxVERTICAL)
+            height = 140;
+        else
+            height = 14;
+    }

 
     // TODO create scrollbar
 
     // TODO create scrollbar

+
+    m_pageSize = 1;
+    m_viewSize = 1;
+    m_objectSize = 1;
+
+    SetFont(parent->GetFont());
+
+    m_hWnd = 0; // TODO: (WXHWND)scroll_bar;
+
+    HWND scroll_bar = 0; // temporary
+
+    // Subclass again for purposes of dialog editing mode
+    SubclassWin((WXHWND) scroll_bar);
+
+    SetSize(x, y, width, height);
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -48,6 +99,91 @@ wxScrollBar::~wxScrollBar()
 {
 }
 
 {
 }
 

+bool wxScrollBar::OS2OnScroll(int WXUNUSED(orientation), WXWORD wParam,
+                              WXWORD pos, WXHWND control)
+{
+    // TODO:
+/*
+    int position = ::GetScrollPos((HWND) control, SB_CTL);
+    int minPos, maxPos;
+    ::GetScrollRange((HWND) control, SB_CTL, &minPos, &maxPos);
+
+#if defined(__WIN95__)
+    // A page size greater than one has the effect of reducing the effective
+    // range, therefore the range has already been boosted artificially - so
+    // reduce it again.
+    if ( m_pageSize > 1 )
+        maxPos -= (m_pageSize - 1);
+#endif // __WIN95__
+
+    wxEventType scrollEvent = wxEVT_NULL;
+
+    int nScrollInc;
+    switch ( wParam )
+    {
+        case SB_TOP:
+            nScrollInc = maxPos - position;
+            scrollEvent = wxEVT_SCROLL_TOP;
+            break;
+
+        case SB_BOTTOM:
+            nScrollInc = - position;
+            scrollEvent = wxEVT_SCROLL_BOTTOM;
+            break;
+
+        case SB_LINEUP:
+            nScrollInc = -1;
+            scrollEvent = wxEVT_SCROLL_LINEUP;
+            break;
+
+        case SB_LINEDOWN:
+            nScrollInc = 1;
+            scrollEvent = wxEVT_SCROLL_LINEDOWN;
+            break;
+
+        case SB_PAGEUP:
+            nScrollInc = -GetPageSize();
+            scrollEvent = wxEVT_SCROLL_PAGEUP;
+            break;
+
+        case SB_PAGEDOWN:
+            nScrollInc = GetPageSize();
+            scrollEvent = wxEVT_SCROLL_PAGEDOWN;
+            break;
+
+        case SB_THUMBTRACK:
+        case SB_THUMBPOSITION:
+            nScrollInc = pos - position;
+            scrollEvent = wxEVT_SCROLL_THUMBTRACK;
+            break;
+
+        default:
+            nScrollInc = 0;
+    }
+
+    if ( nScrollInc == 0 )
+    {
+        // no event to process, so don't process it
+        return FALSE;
+    }
+
+    int new_pos = position + nScrollInc;
+
+    if (new_pos < 0)
+        new_pos = 0;
+    if (new_pos > maxPos)
+        new_pos = maxPos;
+
+    SetThumbPosition(new_pos);
+    wxScrollEvent event(scrollEvent, m_windowId);
+    event.SetPosition(new_pos);
+    event.SetEventObject( this );
+
+    return GetEventHandler()->ProcessEvent(event);
+*/
+    return FALSE;
+}
+

 void wxScrollBar::SetThumbPosition(int viewStart)
 {
     // TODO
 void wxScrollBar::SetThumbPosition(int viewStart)
 {
     // TODO


@@ -69,6 +205,48 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
     // TODO
 }
 
     // TODO
 }
 

+#if WXWIN_COMPATIBILITY
+void wxScrollBar::SetPageSize(int pageLength)
+{
+    m_pageSize = pageLength;
+
+    // TODO:
+}
+
+void wxScrollBar::SetObjectLength(int objectLength)
+{
+    m_objectSize = objectLength;
+
+    // The range (number of scroll steps) is the
+    // object length minus the view size.
+    int range = wxMax((objectLength - m_viewSize), 0) ;
+
+    // TODO:
+}
+
+void wxScrollBar::SetViewLength(int viewLength)
+{
+    m_viewSize = viewLength;
+}
+
+void wxScrollBar::GetValues(int *viewStart, int *viewLength, int *objectLength,
+           int *pageLength) const
+{
+// TODO:
+/*
+    *viewStart = ::GetScrollPos((HWND)m_hWnd, SB_CTL);
+    *viewLength = m_viewSize;
+    *objectLength = m_objectSize;
+    *pageLength = m_pageSize;
+*/
+}
+#endif
+
+WXHBRUSH wxScrollBar::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+{
+  return 0;
+}

 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {


@@ -76,3 +254,20 @@ void wxScrollBar::Command(wxCommandEvent& event)
     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

+#if WXWIN_COMPATIBILITY
+// Backward compatibility
+void wxScrollBar::OnScroll(wxScrollEvent& event)
+{
+    // TODO:
+/*
+    wxEventType oldEvent = event.GetEventType();
+    event.SetEventType( wxEVT_COMMAND_SCROLLBAR_UPDATED );
+    if ( !GetEventHandler()->ProcessEvent(event) )
+    {
+        event.SetEventType( oldEvent );
+        if (!GetParent()->GetEventHandler()->ProcessEvent(event))
+            event.Skip();
+    }
+*/
+}
+#endif