From 7fc65a0384df4007a96cd5bab98b0f7abef0af52 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 6 Oct 2005 11:14:42 +0000 Subject: [PATCH] wxMotif for OS/2 adjustements. Source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/quantize.cpp | 4 ++-- src/generic/dirctrlg.cpp | 12 +++++++++++- src/generic/helpext.cpp | 4 ++-- src/generic/notebook.cpp | 14 +++++++------- src/unix/taskbarx11.cpp | 38 ++++++++++++++++++++------------------ src/x11/bitmap.cpp | 2 +- 6 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/common/quantize.cpp b/src/common/quantize.cpp index efe74bc7f3..695375657c 100644 --- a/src/common/quantize.cpp +++ b/src/common/quantize.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: quantize.cpp +// Name: src/common/quantize.cpp // Purpose: wxQuantize implementation // Author: Julian Smart // Modified by: @@ -73,7 +73,7 @@ typedef unsigned short UINT16; typedef signed short INT16; -#if !(defined(__WATCOMC__) && defined(__WXMSW__)) +#if !(defined(__WATCOMC__) && (defined(__WXMSW__) || defined(__WXMOTIF__))) typedef signed int INT32; #endif diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 1d77415609..b8d0f28c5f 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dirctrlg.cpp +// Name: src/generic/dirctrlg.cpp // Purpose: wxGenericDirCtrl // Author: Harm van der Heijden, Robert Roebling, Julian Smart // Modified by: @@ -166,7 +166,17 @@ size_t wxGetAvailableDrives(wxArrayString &paths, wxArrayString &names, wxArrayI // Note: If _filesys is unsupported by some compilers, // we can always replace it by DosQueryFSAttach char filesysname[20]; +#ifdef __WATCOMC__ + ULONG cbBuffer = sizeof(filesysname); + PFSQBUFFER2 pfsqBuffer = (PFSQBUFFER2)filesysname; + APIRET rc = ::DosQueryFSAttach(name.fn_str(),0,FSAIL_QUERYNAME,pfsqBuffer,&cbBuffer); + if (rc != NO_ERROR) + { + filesysname[0] = '\0'; + } +#else _filesys(name.fn_str(), filesysname, sizeof(filesysname)); +#endif /* FAT, LAN, HPFS, CDFS, NFS */ int imageId; if (path == wxT("A:\\") || path == wxT("B:\\")) diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 9d2a7d620e..f52d28f367 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpext.cpp +// Name: src/generic/helpext.cpp // Purpose: an external help controller for wxWidgets // Author: Karsten Ballueder // Modified by: @@ -121,7 +121,7 @@ wxExtHelpController::DisplayHelp(const wxString &relativeURL) } return true; -#elif defined(__WXPM__) +#elif defined(__OS2__) wxString url; url << m_MapFile << '\\' << relativeURL.BeforeFirst('#'); diff --git a/src/generic/notebook.cpp b/src/generic/notebook.cpp index 6e118b09aa..07eb75b0fc 100644 --- a/src/generic/notebook.cpp +++ b/src/generic/notebook.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: notebook.cpp -// Purpose: implementation of wxNotebook +// Name: src/generic/notebook.cpp +// Purpose: generic implementation of wxNotebook // Author: Julian Smart // Modified by: // Created: 17/09/98 @@ -215,7 +215,7 @@ int wxNotebook::GetPageImage(size_t nPage) const return 0; } -bool wxNotebook::SetPageImage(size_t nPage, int nImage) +bool wxNotebook::SetPageImage(size_t nPage, int WXUNUSED(nImage)) { wxASSERT( IS_VALID_PAGE(nPage) ); @@ -224,19 +224,19 @@ bool wxNotebook::SetPageImage(size_t nPage, int nImage) } // set the size (the same for all pages) -void wxNotebook::SetPageSize(const wxSize& size) +void wxNotebook::SetPageSize(const wxSize& WXUNUSED(size)) { // TODO } // set the padding between tabs (in pixels) -void wxNotebook::SetPadding(const wxSize& padding) +void wxNotebook::SetPadding(const wxSize& WXUNUSED(padding)) { // TODO } // set the size of the tabs for wxNB_FIXEDWIDTH controls -void wxNotebook::SetTabSize(const wxSize& sz) +void wxNotebook::SetTabSize(const wxSize& WXUNUSED(sz)) { // TODO } @@ -381,7 +381,7 @@ bool wxNotebook::InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, bool bSelect, - int imageId) + int WXUNUSED(imageId)) { wxASSERT( pPage != NULL ); wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false ); diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 4f8040c809..10373179fb 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// File: taskbar.cpp +// File: src/unix/taskbarx11.cpp // Purpose: wxTaskBarIcon class for common Unix desktops // Author: Vaclav Slavik // Modified by: @@ -84,7 +84,7 @@ #error "You must define X11 accessors for this port!" #endif - + // ---------------------------------------------------------------------------- // wxTaskBarIconArea is the real window that shows the icon: // ---------------------------------------------------------------------------- @@ -95,10 +95,10 @@ public: wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp); void SetTrayIcon(const wxBitmap& bmp); bool IsOk() { return true; } - + protected: void SetLegacyWMProperties(); - + void OnSizeChange(wxSizeEvent& event); void OnPaint(wxPaintEvent& evt); void OnMouseEvent(wxMouseEvent& event); @@ -107,7 +107,7 @@ protected: wxTaskBarIcon *m_icon; wxPoint m_pos; wxBitmap m_bmp; - + DECLARE_EVENT_TABLE() }; @@ -117,7 +117,7 @@ BEGIN_EVENT_TABLE(wxTaskBarIconArea, wxTaskBarIconAreaBase) EVT_MENU(-1, wxTaskBarIconArea::OnMenuEvent) EVT_PAINT(wxTaskBarIconArea::OnPaint) END_EVENT_TABLE() - + wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp) : wxTaskBarIconAreaBase(), m_icon(icon), m_pos(0,0) { @@ -131,18 +131,18 @@ wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp) #if defined(__WXGTK20__) && defined(TASKBAR_ICON_AREA_BASE_INCLUDED) m_invokingWindow = icon; #endif - + // Set initial size to bitmap size (tray manager may and often will // change it): SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight())); - + SetTrayIcon(bmp); } void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp) { m_bmp = bmp; - + // determine suitable bitmap size: wxSize winsize(GetSize()); wxSize bmpsize(m_bmp.GetWidth(), m_bmp.GetHeight()); @@ -173,13 +173,13 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp) } void wxTaskBarIconArea::SetLegacyWMProperties() -{ +{ #ifdef __WXGTK__ gtk_widget_realize(m_widget); #endif - + long data[1]; - + // KDE 2 & KDE 3: Atom _KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR = XInternAtom(GetDisplay(), "_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR", False); @@ -198,8 +198,8 @@ void wxTaskBarIconArea::SetLegacyWMProperties() KWM_DOCKWINDOW, 32, PropModeReplace, (unsigned char*)data, 1); } - -void wxTaskBarIconArea::OnSizeChange(wxSizeEvent& event) + +void wxTaskBarIconArea::OnSizeChange(wxSizeEvent& WXUNUSED(event)) { wxLogTrace(_T("systray"), _T("icon size changed to %i x %i"), GetSize().x, GetSize().y); @@ -213,7 +213,7 @@ void wxTaskBarIconArea::OnPaint(wxPaintEvent& WXUNUSED(event)) wxPaintDC dc(this); dc.DrawBitmap(m_bmp, m_pos.x, m_pos.y, true); } - + void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event) { wxEventType type = 0; @@ -241,7 +241,7 @@ void wxTaskBarIconArea::OnMouseEvent(wxMouseEvent& event) } void wxTaskBarIconArea::OnMenuEvent(wxCommandEvent& event) -{ +{ m_icon->ProcessEvent(event); } @@ -293,13 +293,15 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip) else { m_iconWnd->SetTrayIcon(bmp); - } - + } + #if wxUSE_TOOLTIPS if (!tooltip.empty()) m_iconWnd->SetToolTip(tooltip); else m_iconWnd->SetToolTip(NULL); +#else + wxUnusedVar(tooltip); #endif return true; } diff --git a/src/x11/bitmap.cpp b/src/x11/bitmap.cpp index 919eef3a12..7d3d136169 100644 --- a/src/x11/bitmap.cpp +++ b/src/x11/bitmap.cpp @@ -1561,7 +1561,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxXBMDataHandler, wxBitmapHandler); bool wxXBMDataHandler::Create( wxBitmap *bitmap, void *bits, long WXUNUSED(flags), - int width, int height, int depth) + int width, int height, int WXUNUSED(depth)) { #if !wxUSE_NANOX if (!bitmap->GetRefData()) -- 2.45.2