Commit Graph

21 Commits

Author SHA1 Message Date
Mattia Barbon
aae91497f6 Removed some old cruft from wxBitmap, moved wxMotif- and
wxControl-specific functionality (GetXXXPixmap) into a separate
class, and fixed the implementation. Adapted wxStaticBitmap,
wxBitmapButton and wxToolBar to the new situation.
  Various fixes to wxToolBar: Realize does not create buttons
multiple times anymore, use the disabled bitmap as the disabled
bitmap, not as the toggled bitmap for toggle buttons (!),
reposition buttons/controls when a tool is removed/deleted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-27 19:40:32 +00:00
Mattia Barbon
1bc822dfb5 Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate
changes to wxIcon.
  Fix deprecation warnings and use %p to format WXWidget in debug output
(fixes the 4 non-deprecation warnings).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-19 09:52:29 +00:00
Jouk Jansen
474cd91658 Committing in .
changed one parameter in the definition of wxBitmap from long to int.
 (just as it is in wxGTK). This solves a compilation problem on OpenVMS.

 Modified Files:
 	wxWindows/include/wx/motif/bitmap.h
 	wxWindows/src/motif/bitmap.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-07-25 13:29:47 +00:00
Václav Slavík
329e276aa0 added wxBitmap::CopyFromIcon and wxIcon::CopyFromBitmap to wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-22 19:14:33 +00:00
Julian Smart
83df96d63a Reformatted Motif headers; added __WXX11__ symbol support to common headers;
added place-holding src/x11 and include/wx/x11 files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-05 16:34:33 +00:00
Julian Smart
244d3b67ca #ifdefed out the joystick code, and removed the wxBitmapList addition
from the wxBitmap constructor that was causing a crash.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-22 12:59:53 +00:00
Václav Slavík
fd85921189 I moved platform specific code from wxImage to wxBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:15:36 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Julian Smart
68be9f090f Added wxDragImage generic implementation and sample; added mask handling to Motif's
wxImage::ConvertToBitmap


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-01 11:05:49 +00:00
Jouk Jansen
1696c17801 Committing in .
Patches for VMS
 Temporarily patch to get the IMAGE sample compiled in MOTIF-mode
  N.B. GetSubImage still gives rubish

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/include/wx/motif/bitmap.h
 	wxWindows/src/common/datetime.cpp
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/motif/bitmap.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-04 15:02:12 +00:00
Vadim Zeitlin
e838cc1468 1. wxMotif toolbar works; the toggle buttons have the same width as the other
ones and not twice as big
2. wxMotif::wxBitmap(from XPM) ctor now takes either "char **" or "const char
   **", as in wxGTK
3. added an X error handler to wxMotif (debug only)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 19:36:05 +00:00
Vadim Zeitlin
d166a4f8e8 wxCreateMaskedBitmap() is more const correct
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-13 20:21:28 +00:00
Vadim Zeitlin
72cdf4c9b3 1. wxApp::ProcessPendingEvents() is now common, added appcmn.cpp and
regenerated the makefiles. wxPostEvent() should work for wxGTK too (untested)
2. long -> wxCoord change for wxGTK and wxMSW, use
   wxUSE_COMPATIBLE_COORD_TYPES to get the old behaviour
3. wxHTML compilation fixes (for !wxUSE_HTML case)
4. a couple of handy macros in thread.h added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-18 15:14:52 +00:00
Julian Smart
cba2db0c29 Some doc corrections (added blank lines at end of docs); corrected Forty sample
dialog behaviour; added dummy menubar constructors; corrected wxMSW wxRegion bug


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-02-12 08:22:29 +00:00
Julian Smart
c0ed460c2e Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-12-08 23:26:18 +00:00
Julian Smart
321db4b6bf More Motif changes (colour/font stuff)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-23 18:22:30 +00:00
Julian Smart
0d57be4594 More Motif stuff incl. beginnings of wxToolBar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-21 21:43:20 +00:00
Julian Smart
a4294b7832 Motif additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-10-18 22:31:48 +00:00
Julian Smart
f97c985452 More wxMotif work, OGL enhancements, USE_ macro corrections, object.cpp delete
operator correction for VC++ 6


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-09-28 15:42:54 +00:00
Julian Smart
16c1f7f345 Some more Motif work; included utils.h in fileconf.cpp (for wxGetHomeDir or something)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-09-22 21:15:56 +00:00
Julian Smart
9b6dbb0974 Added Motif files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-09-18 10:19:10 +00:00