Fixed player dialog listbox size and app icon on wxGTK

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

diff --git a/src/os2/tabctrl.cpp b/src/os2/tabctrl.cpp
index b3b45a72d12a038b60322fd7c374ac7ca3108551..2d4191e90d8518eeb141beee190814fc16aa1e1b 100644 (file)
--- a/src/os2/tabctrl.cpp
+++ b/src/os2/tabctrl.cpp
@@ -1,27 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tabctrl.cpp
+// Name:        src/os2/tabctrl.cpp

 // Purpose:     wxTabCtrl
 // Purpose:     wxTabCtrl

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

 // Modified by:
 // Modified by:

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

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

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

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

-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TAB_DIALOG
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

-#include "wx/control.h"
-#include "wx/tabctrl.h"
+#include "malloc.h"
+
+#define INCL_PM
+#include <os2.h>
+
+//#include "wx/msw/dib.h"
+#include "wx/os2/tabctrl.h"
+#include "wx/os2/private.h"
+#include "wx/imaglist.h"

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()

-#endif

 
 wxTabCtrl::wxTabCtrl()
 {
 
 wxTabCtrl::wxTabCtrl()
 {


@@ -33,40 +44,116 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 {
     m_imageList = NULL;
 
 {
     m_imageList = NULL;
 

+    m_backgroundColour = *wxWHITE; // TODO: wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
+//        GetGValue(GetSysColor(COLOR_BTNFACE)), GetBValue(GetSysColor(COLOR_BTNFACE)));
+    m_foregroundColour = *wxBLACK ;
+

     SetName(name);
 
     SetName(name);
 

+    int x = pos.x;
+    int y = pos.y;
+    int width = size.x;
+    int height = size.y;
+

     m_windowStyle = style;
 
     m_windowStyle = style;
 

+    SetFont(* (wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL)));
+

     SetParent(parent);
 
     SetParent(parent);
 

+    if (width <= 0)
+        width = 100;
+    if (height <= 0)
+        height = 30;
+    if (x < 0)
+        x = 0;
+    if (y < 0)
+        y = 0;
+

     m_windowId = (id < 0 ? NewControlId() : id);
 
     m_windowId = (id < 0 ? NewControlId() : id);
 

+    // Create the toolbar control.
+    HWND hWndTabCtrl = 0;
+    // TODO: create tab control
+
+    m_hWnd = (WXHWND) hWndTabCtrl;

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

-    // TODO: create tab control
-    return FALSE;
+    SubclassWin((WXHWND) hWndTabCtrl);
+
+    return false;

 }
 
 wxTabCtrl::~wxTabCtrl()
 {
 }
 
 wxTabCtrl::~wxTabCtrl()
 {

+    UnsubclassWin();
+}
+
+bool wxTabCtrl::OS2OnNotify(int      idCtrl,
+                            WXLPARAM WXUNUSED(lParam),
+                            WXLPARAM *WXUNUSED(result) )
+{
+    wxTabEvent event(wxEVT_NULL, m_windowId);
+    wxEventType eventType = wxEVT_NULL;
+// TODO:
+/*
+    NMHDR* hdr1 = (NMHDR*) lParam;
+    switch ( hdr1->code )
+    {
+        case TCN_SELCHANGE:
+            eventType = wxEVT_COMMAND_TAB_SEL_CHANGED;
+            break;
+
+        case TCN_SELCHANGING:
+            eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
+            break;
+
+        case TTN_NEEDTEXT:
+        {
+            // TODO
+//            if (tool->m_shortHelpString != "")
+//                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
+        }
+
+        default :
+            return wxControl::OS2OnNotify(idCtrl, lParam, result);
+    }
+*/
+    event.SetEventObject( this );
+    event.SetEventType(eventType);
+    event.SetInt(idCtrl) ;
+
+    return ProcessEvent(event);

 }
 
 }
 

-void wxTabCtrl::Command(wxCommandEvent& event)
+// Responds to colour changes, and passes event on to children.
+void wxTabCtrl::OnSysColourChanged(wxSysColourChangedEvent& event)

 {
 {

+    // TODO:
+/*
+    m_backgroundColour = wxColour(GetRValue(GetSysColor(COLOR_BTNFACE)),
+                                  GetGValue(GetSysColor(COLOR_BTNFACE)),
+                                  GetBValue(GetSysColor(COLOR_BTNFACE)));
+
+    Refresh();
+*/
+    // Propagate the event to the non-top-level children
+    wxWindow::OnSysColourChanged(event);

 }
 
 }
 

+

 // Delete all items
 bool wxTabCtrl::DeleteAllItems()
 {
     // TODO
 // Delete all items
 bool wxTabCtrl::DeleteAllItems()
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Delete an item
 }
 
 // Delete an item

-bool wxTabCtrl::DeleteItem(int item)
+bool wxTabCtrl::DeleteItem(int WXUNUSED(item))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Get the selection
 }
 
 // Get the selection


@@ -97,10 +184,11 @@ int wxTabCtrl::GetItemCount() const
 }
 
 // Get the rect corresponding to the tab
 }
 
 // Get the rect corresponding to the tab

-bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const
+bool wxTabCtrl::GetItemRect(int     WXUNUSED(item),
+                            wxRect& WXUNUSED(wxrect)) const

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Get the number of rows
 }
 
 // Get the number of rows


@@ -111,91 +199,162 @@ int wxTabCtrl::GetRowCount() const
 }
 
 // Get the item text
 }
 
 // Get the item text

-wxString wxTabCtrl::GetItemText(int item) const
+wxString wxTabCtrl::GetItemText(int WXUNUSED(item)) const

 {
     // TODO
 {
     // TODO

-    return wxString("");
+    return wxEmptyString;

 }
 
 // Get the item image
 }
 
 // Get the item image

-int wxTabCtrl::GetItemImage(int item) const
+int wxTabCtrl::GetItemImage(int WXUNUSED(item)) const

 {
     // TODO
     return 0;
 }
 
 // Get the item data
 {
     // TODO
     return 0;
 }
 
 // Get the item data

-void* wxTabCtrl::GetItemData(int item) const
+void* wxTabCtrl::GetItemData(int WXUNUSED(item)) const

 {
     // TODO
     return NULL;
 }
 
 // Hit test
 {
     // TODO
     return NULL;
 }
 
 // Hit test

-int wxTabCtrl::HitTest(const wxPoint& pt, long& flags)
+int wxTabCtrl::HitTest(const wxPoint& WXUNUSED(pt), long& WXUNUSED(flags))

 {
     // TODO
     return 0;
 }
 
 // Insert an item
 {
     // TODO
     return 0;
 }
 
 // Insert an item

-bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data)
+bool wxTabCtrl::InsertItem(int WXUNUSED(item),
+                           const wxString& WXUNUSED(text),
+                           int WXUNUSED(imageId),
+                           void* WXUNUSED(data))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Set the selection
 }
 
 // Set the selection

-int wxTabCtrl::SetSelection(int item)
+int wxTabCtrl::SetSelection(int WXUNUSED(item))

 {
     // TODO
     return 0;
 }
 
 // Set the image list
 {
     // TODO
     return 0;
 }
 
 // Set the image list

-void wxTabCtrl::SetImageList(wxImageList* imageList)
+void wxTabCtrl::SetImageList(wxImageList* WXUNUSED(imageList))

 {
     // TODO
 }
 
 // Set the text for an item
 {
     // TODO
 }
 
 // Set the text for an item

-bool wxTabCtrl::SetItemText(int item, const wxString& text)
+bool wxTabCtrl::SetItemText(int WXUNUSED(item), const wxString& WXUNUSED(text))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Set the image for an item
 }
 
 // Set the image for an item

-bool wxTabCtrl::SetItemImage(int item, int image)
+bool wxTabCtrl::SetItemImage(int WXUNUSED(item), int WXUNUSED(image))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Set the data for an item
 }
 
 // Set the data for an item

-bool wxTabCtrl::SetItemData(int item, void* data)
+bool wxTabCtrl::SetItemData(int WXUNUSED(item), void* WXUNUSED(data))

 {
     // TODO
 {
     // TODO

-    return FALSE;
+    return false;

 }
 
 // Set the size for a fixed-width tab control
 }
 
 // Set the size for a fixed-width tab control

-void wxTabCtrl::SetItemSize(const wxSize& size)
+void wxTabCtrl::SetItemSize(const wxSize& WXUNUSED(size))

 {
     // TODO
 }
 
 // Set the padding between tabs
 {
     // TODO
 }
 
 // Set the padding between tabs

-void wxTabCtrl::SetPadding(const wxSize& padding)
+void wxTabCtrl::SetPadding(const wxSize& WXUNUSED(padding))

 {
     // TODO
 }
 
 {
     // TODO
 }
 

+#if 0
+// These are the default colors used to map the bitmap colors
+// to the current system colors
+
+#define BGR_BUTTONTEXT      (RGB(000,000,000))  // black
+#define BGR_BUTTONSHADOW    (RGB(128,128,128))  // dark grey
+#define BGR_BUTTONFACE      (RGB(192,192,192))  // bright grey
+#define BGR_BUTTONHILIGHT   (RGB(255,255,255))  // white
+#define BGR_BACKGROUNDSEL   (RGB(255,000,000))  // blue
+#define BGR_BACKGROUND      (RGB(255,000,255))  // magenta
+
+void wxMapBitmap(HBITMAP hBitmap, int width, int height)
+{
+  COLORMAP ColorMap[] = {
+    {BGR_BUTTONTEXT,    COLOR_BTNTEXT},     // black
+    {BGR_BUTTONSHADOW,  COLOR_BTNSHADOW},   // dark grey
+    {BGR_BUTTONFACE,    COLOR_BTNFACE},     // bright grey
+    {BGR_BUTTONHILIGHT, COLOR_BTNHIGHLIGHT},// white
+    {BGR_BACKGROUNDSEL, COLOR_HIGHLIGHT},   // blue
+    {BGR_BACKGROUND,    COLOR_WINDOW}       // magenta
+  };
+
+  int NUM_MAPS = (sizeof(ColorMap)/sizeof(COLORMAP));
+  int n;
+  for ( n = 0; n < NUM_MAPS; n++)
+  {
+    ColorMap[n].to = ::GetSysColor(ColorMap[n].to);
+  }
+
+  HBITMAP hbmOld;
+  HDC hdcMem = CreateCompatibleDC(NULL);
+
+  if (hdcMem)
+  {
+    hbmOld = SelectObject(hdcMem, hBitmap);
+
+    int i, j, k;
+    for ( i = 0; i < width; i++)
+    {
+        for ( j = 0; j < height; j++)
+        {
+            COLORREF pixel = ::GetPixel(hdcMem, i, j);
+/*
+            BYTE red = GetRValue(pixel);
+            BYTE green = GetGValue(pixel);
+            BYTE blue = GetBValue(pixel);
+*/
+
+            for ( k = 0; k < NUM_MAPS; k ++)
+            {
+                if ( ColorMap[k].from == pixel )
+                {
+                    /* COLORREF actualPixel = */ ::SetPixel(hdcMem, i, j, ColorMap[k].to);
+                    break;
+                }
+            }
+        }
+    }
+
+
+    SelectObject(hdcMem, hbmOld);
+    DeleteObject(hdcMem);
+  }
+
+}
+#endif
+

 // Tab event
 IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
 
 // Tab event
 IMPLEMENT_DYNAMIC_CLASS(wxTabEvent, wxCommandEvent)
 

-wxTabEvent::wxTabEvent(wxEventType commandType, int id):
-  wxCommandEvent(commandType, id)
+wxTabEvent::wxTabEvent(wxEventType commandType, int id)
+           :wxCommandEvent(commandType, id)

 {
 }
 
 {
 }
 

+#endif // wxUSE_TAB_DIALOG