From 76db86e7e18d308dec0b0d6e9ab817775a8ab278 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 27 Oct 1999 19:01:58 +0000 Subject: [PATCH] Minor Motif changes, made scrollsub sample work somehow. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 4 +- distrib/msw/tmake/filelist.txt | 2 +- include/wx/motif/dataform.h | 58 +++++++------ include/wx/motif/dc.h | 11 --- samples/scrollsub/scrollsub.cpp | 4 +- src/motif/dataobj.cpp | 148 +++++++++++++------------------- src/motif/dc.cpp | 41 +-------- src/motif/window.cpp | 34 +++++++- 8 files changed, 137 insertions(+), 165 deletions(-) diff --git a/Makefile.in b/Makefile.in index cd38841e9f..720cee9a9c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 20:51, 1999/10/26 +# This file was automatically generated by tmake at 18:44, 1999/10/27 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -1128,7 +1128,6 @@ MOTIF_COMMONOBJS = \ mstream.o \ object.o \ objstrm.o \ - odbc.o \ paper.o \ prntbase.o \ process.o \ @@ -1224,7 +1223,6 @@ MOTIF_COMMONDEPS = \ mstream.d \ object.d \ objstrm.d \ - odbc.d \ paper.d \ prntbase.d \ process.d \ diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index a00457f633..f8e980ed7f 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -149,7 +149,7 @@ module.cpp C B mstream.cpp C object.cpp C B objstrm.cpp C -odbc.cpp C R +odbc.cpp C R,X paper.cpp C prntbase.cpp C process.cpp C 32,B diff --git a/include/wx/motif/dataform.h b/include/wx/motif/dataform.h index 03f04a76c7..e6dbcb0a91 100644 --- a/include/wx/motif/dataform.h +++ b/include/wx/motif/dataform.h @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// // Name: motif/dataform.h // Purpose: declaration of the wxDataFormat class -// Author: Vadim Zeitlin +// Author: Robert Roebling // Modified by: // Created: 19.10.99 (extracted from motif/dataobj.h) // RCS-ID: $Id$ -// Copyright: (c) 1998 Vadim Zeitlin +// Copyright: (c) 1999 Robert Roebling // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -15,42 +15,52 @@ class wxDataFormat { public: - typedef unsigned long /* Atom */ NativeFormat; + // the clipboard formats under Xt are Atoms + typedef Atom NativeFormat; wxDataFormat(); wxDataFormat( wxDataFormatId type ); wxDataFormat( const wxString &id ); wxDataFormat( const wxChar *id ); - wxDataFormat( const wxDataFormat &format ); - wxDataFormat( const Atom atom ); + wxDataFormat( NativeFormat format ); - void SetType( wxDataFormatId type ); - NativeFormat GetType() const { return m_type; } + wxDataFormat& operator=(NativeFormat format) + { SetId(format); return *this; } - /* the string Id identifies the format of clipboard or DnD data. a word - * processor would e.g. add a wxTextDataObject and a wxPrivateDataObject - * to the clipboard - the latter with the Id "application/wxword", an - * image manipulation program would put a wxBitmapDataObject and a - * wxPrivateDataObject to the clipboard - the latter with "image/png". */ + // comparison (must have both versions) + bool operator==(NativeFormat format) const + { return m_format == (NativeFormat)format; } + bool operator!=(NativeFormat format) const + { return m_format != (NativeFormat)format; } + bool operator==(wxDataFormatId format) const + { return m_type == (wxDataFormatId)format; } + bool operator!=(wxDataFormatId format) const + { return m_type != (wxDataFormatId)format; } - wxString GetId() const { return m_id; } - void SetId( const wxChar *id ); + // explicit and implicit conversions to NativeFormat which is one of + // standard data types (implicit conversion is useful for preserving the + // compatibility with old code) + NativeFormat GetFormatId() const { return m_format; } + operator NativeFormat() const { return m_format; } - Atom GetAtom(); - void SetAtom(Atom atom) { m_hasAtom = TRUE; m_atom = atom; } + void SetId( NativeFormat format ); - // implicit conversion to wxDataFormatId - operator NativeFormat() const { return m_type; } + // string ids are used for custom types - this SetId() must be used for + // application-specific formats + wxString GetId() const; + void SetId( const wxChar *id ); - bool operator==(NativeFormat type) const { return m_type == type; } - bool operator!=(NativeFormat type) const { return m_type != type; } + // implementation + wxDataFormatId GetType() const; private: - NativeFormat m_type; - wxString m_id; - bool m_hasAtom; - Atom m_atom; + wxDataFormatId m_type; + NativeFormat m_format; + + void PrepareFormats(); + void SetType( wxDataFormatId type ); }; + #endif // _WX_MOTIF_DATAFORM_H diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h index a80111b22b..fb6316232e 100644 --- a/include/wx/motif/dc.h +++ b/include/wx/motif/dc.h @@ -155,21 +155,10 @@ public: return (wxCoord)((double)(y) * m_scaleY - 0.5); } - void SetInternalDeviceOrigin( wxCoord x, wxCoord y ); - void GetInternalDeviceOrigin( wxCoord *x, wxCoord *y ); - public: // not sure what for, but what is a mm on a screen you don't know the size of? double m_mm_to_pix_x,m_mm_to_pix_y; - // If un-scrolled is non-zero or d.o. changes with scrolling. Set using - // SetInternalDeviceOrigin(). - wxCoord m_internalDeviceOriginX,m_internalDeviceOriginY; - - // To be set by external classes such as wxScrolledWindow using - // SetDeviceOrigin() - wxCoord m_externalDeviceOriginX,m_externalDeviceOriginY; - // recompute scale? bool m_needComputeScaleX, m_needComputeScaleY; diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp index da86fbb5ac..d1e09ec23e 100644 --- a/samples/scrollsub/scrollsub.cpp +++ b/samples/scrollsub/scrollsub.cpp @@ -171,8 +171,10 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) wxPaintDC dc( this ); m_owner->PrepareDC( dc ); + dc.SetPen( *wxBLACK_PEN ); + dc.DrawText( "Some text", 140, 140 ); - + dc.DrawRectangle( 100, 160, 200, 200 ); dc.SetBrush( *wxTRANSPARENT_BRUSH ); diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp index de8ab39666..765ece2233 100644 --- a/src/motif/dataobj.cpp +++ b/src/motif/dataobj.cpp @@ -25,7 +25,9 @@ // global data //------------------------------------------------------------------------- -Atom g_textAtom = 0; +Atom g_textAtom = 0; +Atom g_pngAtom = 0; +Atom g_fileAtom = 0; //------------------------------------------------------------------------- // wxDataFormat @@ -33,134 +35,108 @@ Atom g_textAtom = 0; wxDataFormat::wxDataFormat() { + // do *not* call PrepareFormats() from here for 2 reasons: + // + // 1. we will have time to do it later because some other Set function + // must be called before we really need them + // + // 2. doing so prevents us from declaring global wxDataFormats because + // calling PrepareFormats (and thus gdk_atom_intern) before GDK is + // initialised will result in a crash m_type = wxDF_INVALID; - m_hasAtom = FALSE; - m_atom = (Atom) 0; + m_format = (Atom) 0; } wxDataFormat::wxDataFormat( wxDataFormatId type ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + PrepareFormats(); SetType( type ); } wxDataFormat::wxDataFormat( const wxChar *id ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + PrepareFormats(); SetId( id ); } wxDataFormat::wxDataFormat( const wxString &id ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + PrepareFormats(); SetId( id ); } -wxDataFormat::wxDataFormat( const wxDataFormat &format ) +wxDataFormat::wxDataFormat( NativeFormat format ) { - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); - m_type = format.GetType(); - m_id = format.GetId(); - m_hasAtom = TRUE; - m_atom = ((wxDataFormat &)format).GetAtom(); // const_cast -} - -wxDataFormat::wxDataFormat( const Atom atom ) -{ - if (!g_textAtom) g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); - m_hasAtom = TRUE; - - m_atom = atom; - - if (m_atom == g_textAtom) - { - m_type = wxDF_TEXT; - } else -/* - if (m_atom == GDK_TARGET_BITMAP) - { - m_type = wxDF_BITMAP; - } else -*/ - { - m_type = wxDF_PRIVATE; - m_id = XGetAtomName( (Display*) wxGetDisplay(), m_atom ); - - if (m_id == wxT("file:ALL")) - { - m_type = wxDF_FILENAME; - } - } + PrepareFormats(); + SetId( format ); } void wxDataFormat::SetType( wxDataFormatId type ) { + PrepareFormats(); m_type = type; if (m_type == wxDF_TEXT) - { - m_id = wxT("STRING"); - } + m_format = g_textAtom; else if (m_type == wxDF_BITMAP) - { - m_id = wxT("BITMAP"); - } + m_format = g_pngAtom; else if (m_type == wxDF_FILENAME) - { - m_id = wxT("file:ALL"); - } + m_format = g_fileAtom; else { wxFAIL_MSG( wxT("invalid dataformat") ); } +} + +wxDataFormatId wxDataFormat::GetType() const +{ + return m_type; +} + +wxString wxDataFormat::GetId() const +{ + char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format); + wxString ret( t ); // this will convert from ascii to Unicode + if (t) + XFree( t ); + return ret; +} + +void wxDataFormat::SetId( NativeFormat format ) +{ + PrepareFormats(); + m_format = format; - m_hasAtom = FALSE; + if (m_format == g_textAtom) + m_type = wxDF_TEXT; + else + if (m_format == g_pngAtom) + m_type = wxDF_BITMAP; + else + if (m_format == g_fileAtom) + m_type = wxDF_FILENAME; + else + m_type = wxDF_PRIVATE; } void wxDataFormat::SetId( const wxChar *id ) { + PrepareFormats(); m_type = wxDF_PRIVATE; - m_id = id; - m_hasAtom = FALSE; + wxString tmp( id ); + m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE ); // what is the string cast for? } -Atom wxDataFormat::GetAtom() +void wxDataFormat::PrepareFormats() { - if (!m_hasAtom) - { - m_hasAtom = TRUE; - - if (m_type == wxDF_TEXT) - { - m_atom = g_textAtom; - } - else -/* - if (m_type == wxDF_BITMAP) - { - m_atom = GDK_TARGET_BITMAP; - } - else -*/ - if (m_type == wxDF_PRIVATE) - { - m_atom = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST m_id.mbc_str(), FALSE ); - } - else - if (m_type == wxDF_FILENAME) - { - m_atom = XInternAtom( (Display*) wxGetDisplay(), "file:ALL", FALSE ); - } - else - { - m_hasAtom = FALSE; - m_atom = (Atom) 0; - } - } - - return m_atom; + if (!g_textAtom) + g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE ); + if (!g_pngAtom) + g_pngAtom = XInternAtom( (Display*) wxGetDisplay(), "image/png", FALSE ); + if (!g_fileAtom) + g_fileAtom = XInternAtom( (Display*) wxGetDisplay(), "file:ALL", FALSE ); } #if 0 diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index 1509fb3353..cba31c0c30 100644 --- a/src/motif/dc.cpp +++ b/src/motif/dc.cpp @@ -46,11 +46,6 @@ wxDC::wxDC() m_backgroundMode = wxTRANSPARENT; m_isInteractive = FALSE; - - m_internalDeviceOriginX = 0; - m_internalDeviceOriginY = 0; - m_externalDeviceOriginX = 0; - m_externalDeviceOriginY = 0; } void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y) @@ -178,24 +173,12 @@ void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y ) void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y ) { - m_externalDeviceOriginX = x; - m_externalDeviceOriginY = y; + // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there + m_deviceOriginX = x; + m_deviceOriginY = y; ComputeScaleAndOrigin(); } -void wxDC::SetInternalDeviceOrigin( wxCoord x, wxCoord y ) -{ - m_internalDeviceOriginX = x; - m_internalDeviceOriginY = y; - ComputeScaleAndOrigin(); -} - -void wxDC::GetInternalDeviceOrigin( wxCoord *x, wxCoord *y ) -{ - if (x) *x = m_internalDeviceOriginX; - if (y) *y = m_internalDeviceOriginY; -} - void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { m_signX = xLeftRight ? 1 : -1; @@ -245,25 +228,7 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const void wxDC::ComputeScaleAndOrigin() { - // CMB: copy scale to see if it changes - double origScaleX = m_scaleX; - double origScaleY = m_scaleY; - m_scaleX = m_logicalScaleX * m_userScaleX; m_scaleY = m_logicalScaleY * m_userScaleY; - - m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX; - m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY; - - // CMB: if scale has changed call SetPen to recalulate the line width - if (m_scaleX != origScaleX || m_scaleY != origScaleY) - { - // this is a bit artificial, but we need to force wxDC to think - // the pen has changed - wxPen* pen = & GetPen(); - wxPen tempPen; - m_pen = tempPen; - SetPen(* pen); - } } diff --git a/src/motif/window.cpp b/src/motif/window.cpp index 0959d93286..ac82518a24 100644 --- a/src/motif/window.cpp +++ b/src/motif/window.cpp @@ -245,7 +245,18 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, XtAppAddActions ((XtAppContext) wxTheApp->GetAppContext(), actions, 1); Widget parentWidget = (Widget) parent->GetClientWidget(); - if (style & wxBORDER) + + if (style & wxSIMPLE_BORDER) + { + m_borderWidget = (WXWidget)XtVaCreateManagedWidget + ( + "canvasBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_IN, + XmNshadowThickness, 1, + NULL + ); + } else if (style & wxSUNKEN_BORDER) { m_borderWidget = (WXWidget)XtVaCreateManagedWidget ( @@ -254,6 +265,15 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID id, XmNshadowType, XmSHADOW_IN, NULL ); + } else if (style & wxRAISED_BORDER) + { + m_borderWidget = (WXWidget)XtVaCreateManagedWidget + ( + "canvasBorder", + xmFrameWidgetClass, parentWidget, + XmNshadowType, XmSHADOW_OUT, + NULL + ); } m_scrolledWindow = (WXWidget)XtVaCreateManagedWidget @@ -880,6 +900,18 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) GetClientSize(& w, & h); } + wxNode *cnode = m_children.First(); + while (cnode) + { + wxWindow *child = (wxWindow*) cnode->Data(); + int sx = 0; + int sy = 0; + child->GetSize( &sx, &sy ); + wxPoint pos( child->GetPosition() ); + child->SetSize( pos.x + dx, pos.y + dy, sx, sy, wxSIZE_ALLOW_MINUS_ONE ); + cnode = cnode->Next(); + } + int x1 = (dx >= 0) ? x : x - dx; int y1 = (dy >= 0) ? y : y - dy; int w1 = w - abs(dx); -- 2.49.0