no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
630
src/os2/data.cpp
630
src/os2/data.cpp
@@ -9,10 +9,6 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "data.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
@@ -141,7 +137,6 @@ const wxChar *wxButtonBarNameStr = wxT("buttonbar");
|
||||
const wxChar *wxEnhDialogNameStr = wxT("Shell");
|
||||
const wxChar *wxToolBarNameStr = wxT("toolbar");
|
||||
const wxChar *wxStatusLineNameStr = wxT("status_line");
|
||||
const wxChar *wxEmptyString = wxT("");
|
||||
const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text");
|
||||
const wxChar *wxMessageBoxCaptionStr = wxT("Message");
|
||||
const wxChar *wxFileSelectorPromptStr = wxT("Select a file");
|
||||
@@ -156,631 +151,8 @@ const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
|
||||
const wxChar *wxFloatToStringStr = wxT("%.2f");
|
||||
const wxChar *wxDoubleToStringStr = wxT("%.2f");
|
||||
|
||||
#ifdef __WXMSW__
|
||||
const wxChar *wxUserResourceStr = wxT("TEXT");
|
||||
#endif
|
||||
|
||||
#if wxUSE_SHARED_LIBRARY
|
||||
/*
|
||||
* For wxWindows to be made into a dynamic library (e.g. Sun),
|
||||
* all IMPLEMENT_... macros must be in one place.
|
||||
* But normally, the definitions are in the appropriate places.
|
||||
*/
|
||||
|
||||
// Hand-coded IMPLEMENT... macro for wxObject (define static data)
|
||||
wxClassInfo wxObject::classwxObject("wxObject", NULL, NULL, sizeof(wxObject), NULL);
|
||||
wxClassInfo *wxClassInfo::first = NULL;
|
||||
wxClassInfo wxClassInfo::classTable(wxKEY_STRING);
|
||||
|
||||
#include "wx/button.h"
|
||||
#include "wx/bmpbuttn.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
|
||||
|
||||
#include "wx/checkbox.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
|
||||
|
||||
#include "wx/choice.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
|
||||
|
||||
#if wxUSE_CLIPBOARD
|
||||
#include "wx/clipbrd.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
|
||||
#endif
|
||||
|
||||
#if wxUSE_COMBOBOX
|
||||
#include "wx/combobox.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
|
||||
#endif
|
||||
|
||||
#include "wx/dc.h"
|
||||
#include "wx/dcmemory.h"
|
||||
#include "wx/dcclient.h"
|
||||
#include "wx/dcscreen.h"
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxWindowDC)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxWindowDC)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
|
||||
|
||||
#if defined(__WXMSW__)
|
||||
#include "wx/dcprint.h"
|
||||
IMPLEMENT_CLASS(wxPrinterDC, wxDC)
|
||||
#endif
|
||||
|
||||
#include "wx/dialog.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxWindow)
|
||||
|
||||
#include "wx/frame.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
|
||||
|
||||
#include "wx/mdi.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
|
||||
|
||||
#include "wx/cmndata.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
|
||||
|
||||
#include "wx/colordlg.h"
|
||||
#include "wx/fontdlg.h"
|
||||
|
||||
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
|
||||
#include "wx/generic/colordlg.h"
|
||||
#include "wx/generic/fontdlg.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
|
||||
#endif
|
||||
|
||||
// X defines wxColourDialog to be wxGenericColourDialog
|
||||
#ifndef __X__
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
|
||||
#endif
|
||||
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/pen.h"
|
||||
#include "wx/brush.h"
|
||||
#include "wx/font.h"
|
||||
#include "wx/palette.h"
|
||||
#include "wx/icon.h"
|
||||
#include "wx/cursor.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
|
||||
IMPLEMENT_CLASS(wxColourDatabase, wxList)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
|
||||
|
||||
/*
|
||||
#if (!USE_TYPEDEFS)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
|
||||
#endif
|
||||
*/
|
||||
|
||||
#include "wx/hash.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
|
||||
|
||||
#include "wx/helpbase.h"
|
||||
IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
|
||||
|
||||
#if wxUSE_HELP
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/msw/helpwin.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
|
||||
#endif
|
||||
|
||||
// Generic wxHelp controller
|
||||
IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
|
||||
|
||||
#ifdef __WXMSW__
|
||||
IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
|
||||
IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
|
||||
#else
|
||||
IMPLEMENT_CLASS(wxXLPHelpClient, wxTCPClient)
|
||||
IMPLEMENT_CLASS(wxXLPHelpConnection, wxTCPConnection)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
|
||||
|
||||
#include "wx/list.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxNode, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxList)
|
||||
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
#include "wx/print.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPrinterBase, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
|
||||
IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
|
||||
IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
|
||||
IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
|
||||
IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
|
||||
IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
|
||||
IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
|
||||
IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
|
||||
IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
|
||||
#endif
|
||||
|
||||
#if wxUSE_POSTSCRIPT
|
||||
#include "wx/dcps.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)
|
||||
#endif
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
|
||||
|
||||
#if wxUSE_WX_RESOURCES
|
||||
#include "wx/resource.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
|
||||
#endif
|
||||
|
||||
#include "wx/event.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxNotifyEvent, wxCommandEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxShowEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMaximizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIconizeEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
|
||||
|
||||
#include "wx/utils.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
|
||||
|
||||
// IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
|
||||
|
||||
#include "wx/process.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
|
||||
|
||||
#if wxUSE_TIMEDATE
|
||||
#include "wx/date.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
|
||||
#endif
|
||||
|
||||
#if wxUSE_DOC_VIEW_ARCHITECTURE
|
||||
#include "wx/docview.h"
|
||||
//IMPLEMENT_ABSTRACT_CLASS(wxDocItem, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
|
||||
IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
|
||||
IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
|
||||
#if wxUSE_PRINTING_ARCHITECTURE
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
|
||||
#endif
|
||||
IMPLEMENT_CLASS(wxCommand, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
|
||||
#endif
|
||||
|
||||
#if wxUSE_CONSTRAINTS
|
||||
#include "wx/layout.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSizer, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRowColSizer, wxSizer)
|
||||
#endif
|
||||
|
||||
#if wxUSE_TOOLBAR
|
||||
#include "wx/tbarbase.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
|
||||
|
||||
#include "wx/tbarsmpl.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#include "wx/tbarmsw.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)
|
||||
|
||||
#include "wx/tbar95.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#if wxUSE_SOCKETS
|
||||
|
||||
#include "wx/sckaddr.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
|
||||
#ifdef ENABLE_IPV6
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
|
||||
#endif
|
||||
#ifndef __UNIX__
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
|
||||
#endif
|
||||
|
||||
#include "wx/socket.h"
|
||||
|
||||
IMPLEMENT_CLASS(wxSocketBase, wxEvtHandler)
|
||||
IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
|
||||
IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
|
||||
IMPLEMENT_CLASS(wxSocketHandler, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
|
||||
|
||||
#include "wx/url.h"
|
||||
|
||||
IMPLEMENT_CLASS(wxProtoInfo, wxObject)
|
||||
IMPLEMENT_CLASS(wxURL, wxObject)
|
||||
|
||||
#include "wx/protocol/http.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
|
||||
IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
|
||||
|
||||
#include "wx/protocol/ftp.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
|
||||
IMPLEMENT_PROTOCOL(wxFTP, "ftp", "21", TRUE)
|
||||
|
||||
#include "wx/protocol/sckfile.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
|
||||
IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
|
||||
|
||||
#include "wx/sckipc.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
|
||||
|
||||
#endif
|
||||
|
||||
#include "wx/statusbr.h"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
|
||||
|
||||
BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
|
||||
EVT_PAINT(wxStatusBar::OnPaint)
|
||||
EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#if wxUSE_TIMEDATE
|
||||
#include "wx/time.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
|
||||
#endif
|
||||
|
||||
#if !USE_GNU_WXSTRING
|
||||
#include "wx/string.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
|
||||
#endif
|
||||
|
||||
#ifdef __WXMOTIF__
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXColormap, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXFont, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject)
|
||||
#endif
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
|
||||
|
||||
// This will presumably be implemented on other platforms too
|
||||
#ifdef __WXMSW__
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
|
||||
#endif
|
||||
|
||||
#include "wx/statbox.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
|
||||
|
||||
#if wxUSE_IPC
|
||||
#include "wx/dde.h"
|
||||
IMPLEMENT_CLASS(wxServerBase, wxObject)
|
||||
IMPLEMENT_CLASS(wxClientBase, wxObject)
|
||||
IMPLEMENT_CLASS(wxConnectionBase, wxObject)
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxServerBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxClientBase)
|
||||
IMPLEMENT_CLASS(wxDDEConnection, wxConnectionBase)
|
||||
#endif
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
|
||||
|
||||
#include "wx/listbox.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
|
||||
|
||||
#include "wx/checklst.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
|
||||
|
||||
#include "wx/menu.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
|
||||
|
||||
#include "wx/stattext.h"
|
||||
#include "wx/statbmp.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
|
||||
|
||||
#if wxUSE_METAFILE
|
||||
#include "wx/metafile.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
|
||||
#endif
|
||||
|
||||
#include "wx/radiobox.h"
|
||||
#include "wx/radiobut.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
|
||||
// IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
|
||||
|
||||
#include "wx/scrolbar.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
|
||||
EVT_SCROLL(wxScrollBar::OnScroll)
|
||||
END_EVENT_TABLE()
|
||||
#endif
|
||||
|
||||
#include "wx/slider.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
|
||||
|
||||
#if WXWIN_COMPATIBILITY
|
||||
BEGIN_EVENT_TABLE(wxSlider, wxControl)
|
||||
EVT_SCROLL(wxSlider::OnScroll)
|
||||
END_EVENT_TABLE()
|
||||
#endif
|
||||
|
||||
#include "wx/timer.h"
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
|
||||
|
||||
#include "wx/textctrl.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
|
||||
|
||||
#include "wx/window.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
|
||||
|
||||
#include "wx/scrolwin.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
|
||||
|
||||
#include "wx/panel.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
|
||||
|
||||
#include "wx/msgbxdlg.h"
|
||||
#include "wx/textdlg.h"
|
||||
#include "wx/filedlg.h"
|
||||
#include "wx/dirdlg.h"
|
||||
#include "wx/choicdlg.h"
|
||||
|
||||
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
|
||||
#include "wx/generic/msgdlgg.h"
|
||||
IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
|
||||
#endif
|
||||
|
||||
IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
|
||||
IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
|
||||
IMPLEMENT_CLASS(wxFileDialog, wxDialog)
|
||||
IMPLEMENT_CLASS(wxDirDialog, wxDialog)
|
||||
|
||||
#ifdef __WXMSW__
|
||||
IMPLEMENT_CLASS(wxMessageDialog)
|
||||
#endif
|
||||
|
||||
#if wxUSE_GAUGE
|
||||
#ifdef __WXMOTIF__
|
||||
#include "../../contrib/xmgauge/gauge.h"
|
||||
#endif
|
||||
#include "wx_gauge.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
|
||||
#endif
|
||||
|
||||
#include "wx/grid.h"
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxGenericGrid, wxPanel)
|
||||
|
||||
///// Event tables (also must be in one, statically-linked file for shared libraries)
|
||||
|
||||
// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
|
||||
const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
|
||||
|
||||
const wxEventTable wxEvtHandler::sm_eventTable =
|
||||
{ NULL, &wxEvtHandler::sm_eventTableEntries[0] };
|
||||
|
||||
const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
|
||||
|
||||
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
|
||||
EVT_ACTIVATE(wxFrame::OnActivate)
|
||||
EVT_SIZE(wxFrame::OnSize)
|
||||
EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
|
||||
EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
|
||||
EVT_IDLE(wxFrame::OnIdle)
|
||||
EVT_CLOSE(wxFrame::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxDialog, wxPanel)
|
||||
EVT_BUTTON(wxID_OK, wxDialog::OnOK)
|
||||
EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
|
||||
EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
|
||||
EVT_CHAR_HOOK(wxDialog::OnCharHook)
|
||||
EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
|
||||
EVT_CLOSE(wxDialog::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
|
||||
EVT_CHAR(wxWindow::OnChar)
|
||||
EVT_SIZE(wxWindow::Size)
|
||||
EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
|
||||
EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
|
||||
EVT_INIT_DIALOG(wxWindow::OnInitDialog)
|
||||
EVT_IDLE(wxWindow::OnIdle)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)
|
||||
EVT_SCROLL(wxScrolledWindow::OnScroll)
|
||||
EVT_SIZE(wxScrolledWindow::OnSize)
|
||||
EVT_PAINT(wxScrolledWindow::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxPanel, wxWindow)
|
||||
EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
|
||||
EVT_CHAR(wxTextCtrl::OnChar)
|
||||
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#ifdef __WXMSW__
|
||||
BEGIN_EVENT_TABLE(wxMDIParentWindow, wxFrame)
|
||||
EVT_SIZE(wxMDIParentWindow::OnSize)
|
||||
EVT_ACTIVATE(wxMDIParentWindow::OnActivate)
|
||||
EVT_SYS_COLOUR_CHANGED(wxMDIParentWindow::OnSysColourChanged)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
|
||||
EVT_SCROLL(wxMDIClientWindow::OnScroll)
|
||||
END_EVENT_TABLE()
|
||||
#endif
|
||||
|
||||
BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
|
||||
EVT_SCROLL(wxToolBarBase::OnScroll)
|
||||
EVT_SIZE(wxToolBarBase::OnSize)
|
||||
EVT_IDLE(wxToolBarBase::OnIdle)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
|
||||
EVT_SIZE(wxToolBarSimple::OnSize)
|
||||
EVT_PAINT(wxToolBarSimple::OnPaint)
|
||||
EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
|
||||
EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#ifdef __WXMSW__
|
||||
BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase)
|
||||
EVT_SIZE(wxToolBarMSW::OnSize)
|
||||
EVT_PAINT(wxToolBarMSW::OnPaint)
|
||||
EVT_MOUSE_EVENTS(wxToolBarMSW::OnMouseEvent)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
|
||||
EVT_SIZE(wxToolBar95::OnSize)
|
||||
EVT_PAINT(wxToolBar95::OnPaint)
|
||||
EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
|
||||
EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
|
||||
EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
|
||||
END_EVENT_TABLE()
|
||||
#endif
|
||||
|
||||
BEGIN_EVENT_TABLE(wxGenericGrid, wxPanel)
|
||||
EVT_SIZE(wxGenericGrid::OnSize)
|
||||
EVT_PAINT(wxGenericGrid::OnPaint)
|
||||
EVT_MOUSE_EVENTS(wxGenericGrid::OnMouseEvent)
|
||||
EVT_TEXT(wxGRID_TEXT_CTRL, wxGenericGrid::OnText)
|
||||
EVT_COMMAND_SCROLL(wxGRID_HSCROLL, wxGenericGrid::OnGridScroll)
|
||||
EVT_COMMAND_SCROLL(wxGRID_VSCROLL, wxGenericGrid::OnGridScroll)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxControl, wxWindow)
|
||||
EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#if !defined(__WXMSW__) || wxUSE_GENERIC_DIALOGS_IN_MSW
|
||||
BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
|
||||
EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
|
||||
EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
|
||||
EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
|
||||
EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
|
||||
EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
|
||||
EVT_PAINT(wxGenericColourDialog::OnPaint)
|
||||
EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
|
||||
EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
|
||||
EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
|
||||
EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
|
||||
EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
|
||||
EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
|
||||
EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
|
||||
EVT_PAINT(wxGenericFontDialog::OnPaint)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
|
||||
EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
|
||||
EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#endif
|
||||
|
||||
BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#include "wx/prntbase.h"
|
||||
|
||||
BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
|
||||
EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
BEGIN_EVENT_TABLE(wxPreviewControlBar, wxWindow)
|
||||
EVT_BUTTON(wxID_PREVIEW_CLOSE, wxPreviewControlBar::OnClose)
|
||||
EVT_BUTTON(wxID_PREVIEW_PRINT, wxPreviewControlBar::OnPrint)
|
||||
EVT_BUTTON(wxID_PREVIEW_PREVIOUS, wxPreviewControlBar::OnPrevious)
|
||||
EVT_BUTTON(wxID_PREVIEW_NEXT, wxPreviewControlBar::OnNext)
|
||||
EVT_CHOICE(wxID_PREVIEW_ZOOM, wxPreviewControlBar::OnZoom)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
const wxSize wxDefaultSize(-1, -1);
|
||||
const wxPoint wxDefaultPosition(-1, -1);
|
||||
|
||||
|
||||
1116
src/os2/dc.cpp
1116
src/os2/dc.cpp
File diff suppressed because it is too large
Load Diff
@@ -17,17 +17,9 @@
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "dcclient.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/string.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/window.h"
|
||||
|
||||
@@ -1,35 +1,72 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: dcmemory.cpp
|
||||
// Purpose: wxMemoryDC class
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// Created: 10/14/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "dcmemory.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/utils.h"
|
||||
#endif
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
#include "wx/dcmemory.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxMemoryDC
|
||||
//-----------------------------------------------------------------------------
|
||||
#if !USE_SHARED_LIBRARY
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
|
||||
#endif
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
|
||||
/*
|
||||
* Memory DC
|
||||
*
|
||||
*/
|
||||
|
||||
wxMemoryDC::wxMemoryDC(void)
|
||||
{
|
||||
m_ok = FALSE;
|
||||
};
|
||||
// TODO:
|
||||
/*
|
||||
m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) NULL);
|
||||
m_ok = (m_hDC != 0);
|
||||
m_bOwnsDC = TRUE;
|
||||
|
||||
wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
|
||||
SetBrush(*wxWHITE_BRUSH);
|
||||
SetPen(*wxBLACK_PEN);
|
||||
|
||||
// the background mode is only used for text background
|
||||
// and is set in DrawText() to OPAQUE as required, other-
|
||||
// wise always TRANSPARENT, RR
|
||||
::SetBkMode( GetHdc(), TRANSPARENT );
|
||||
*/
|
||||
}
|
||||
|
||||
wxMemoryDC::wxMemoryDC(wxDC *old_dc)
|
||||
{
|
||||
m_ok = FALSE;
|
||||
};
|
||||
// TODO:
|
||||
/*
|
||||
old_dc->BeginDrawing();
|
||||
|
||||
m_hDC = (WXHDC) ::CreateCompatibleDC((HDC) old_dc->GetHDC());
|
||||
m_ok = (m_hDC != 0);
|
||||
|
||||
old_dc->EndDrawing();
|
||||
|
||||
SetBrush(*wxWHITE_BRUSH);
|
||||
SetPen(*wxBLACK_PEN);
|
||||
|
||||
// the background mode is only used for text background
|
||||
// and is set in DrawText() to OPAQUE as required, other-
|
||||
// wise always TRANSPARENT, RR
|
||||
::SetBkMode( GetHdc(), TRANSPARENT );
|
||||
*/
|
||||
}
|
||||
|
||||
wxMemoryDC::~wxMemoryDC(void)
|
||||
{
|
||||
@@ -37,28 +74,18 @@ wxMemoryDC::~wxMemoryDC(void)
|
||||
|
||||
void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
|
||||
{
|
||||
m_selected = bitmap;
|
||||
if (m_selected.Ok())
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
m_ok = FALSE;
|
||||
};
|
||||
// TODO:
|
||||
};
|
||||
|
||||
void wxMemoryDC::GetSize( int *width, int *height ) const
|
||||
void wxMemoryDC::DoGetSize( int *width, int *height ) const
|
||||
{
|
||||
if (m_selected.Ok())
|
||||
if (!m_selectedBitmap.Ok())
|
||||
{
|
||||
if (width) (*width) = m_selected.GetWidth();
|
||||
if (height) (*height) = m_selected.GetHeight();
|
||||
*width = 0; *height = 0;
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (width) (*width) = 0;
|
||||
if (height) (*height) = 0;
|
||||
};
|
||||
*width = m_selectedBitmap.GetWidth();
|
||||
*height = m_selectedBitmap.GetHeight();
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -1,20 +1,22 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: dcprint.cpp
|
||||
// Purpose: wxPrinterDC class
|
||||
// Author: Julian Smart
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: 01/02/97
|
||||
// Created: 10/14/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Julian Smart and Markus Holzem
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "dcprint.h"
|
||||
#endif
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#define INCL_DEV
|
||||
#define INCL_GPI
|
||||
#define INCL_PM
|
||||
#include<os2.h>
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#endif
|
||||
|
||||
@@ -29,10 +31,6 @@
|
||||
IMPLEMENT_CLASS(wxPrinterDC, wxDC)
|
||||
#endif
|
||||
|
||||
#define INCL_DEV
|
||||
#define INCL_GPI
|
||||
#define INCL_PM
|
||||
#include<os2.h>
|
||||
|
||||
// This form is deprecated
|
||||
wxPrinterDC::wxPrinterDC(const wxString& driver_name, const wxString& device_name, const wxString& file, bool interactive, int orientation)
|
||||
|
||||
@@ -1,18 +1,29 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: dcscreen.cpp
|
||||
// Purpose: wxScreenDC class
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Created: 10/14/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "dcscreen.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#define INCL_DEV
|
||||
#define INCL_GPI
|
||||
#define INCL_PM
|
||||
#include<os2.h>
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/string.h"
|
||||
#include "wx/window.h"
|
||||
#endif
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
#include "wx/dcscreen.h"
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: dialog.cpp
|
||||
// Purpose: wxDialog class
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Created: 10/14/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
@@ -25,10 +25,6 @@
|
||||
#include "wx/os2/private.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
#if wxUSE_COMMON_DIALOGS
|
||||
#include <commdlg.h>
|
||||
#endif
|
||||
|
||||
#define wxDIALOG_DEFAULT_X 300
|
||||
#define wxDIALOG_DEFAULT_Y 300
|
||||
|
||||
|
||||
@@ -1,25 +1,35 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: dirdlg.cpp
|
||||
// Purpose: wxDirDialog
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Created: 10/14/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "dirdlg.h"
|
||||
#endif
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include <stdio.h>
|
||||
#include "wx/defs.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/dirdlg.h"
|
||||
#endif
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
#include "wx/cmndata.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#define wxDIALOG_DEFAULT_X 300
|
||||
#define wxDIALOG_DEFAULT_Y 300
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
IMPLEMENT_CLASS(wxDirDialog, wxDialog)
|
||||
#endif
|
||||
@@ -31,12 +41,12 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
|
||||
m_message = message;
|
||||
m_dialogStyle = style;
|
||||
m_parent = parent;
|
||||
m_path = defaultPath;
|
||||
m_path = defaultPath;
|
||||
}
|
||||
|
||||
int wxDirDialog::ShowModal()
|
||||
{
|
||||
// TODO
|
||||
return wxID_CANCEL;
|
||||
return wxID_CANCEL;
|
||||
}
|
||||
|
||||
|
||||
@@ -9,11 +9,32 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/filedlg.h"
|
||||
#include "wx/intl.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include <stdio.h>
|
||||
#include "wx/defs.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/msgdlg.h"
|
||||
#include "wx/dialog.h"
|
||||
#include "wx/filedlg.h"
|
||||
#include "wx/intl.h"
|
||||
#include "wx/log.h"
|
||||
#endif
|
||||
|
||||
#define INCL_PM
|
||||
#include <os2.h>
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
IMPLEMENT_CLASS(wxFileDialog, wxDialog)
|
||||
@@ -61,6 +82,22 @@ wxString wxFileSelector( const char* title
|
||||
return wxEmptyString;
|
||||
}
|
||||
|
||||
# ifndef MAXPATH
|
||||
# define MAXPATH 400
|
||||
# endif
|
||||
|
||||
# ifndef MAXDRIVE
|
||||
# define MAXDRIVE 3
|
||||
# endif
|
||||
|
||||
# ifndef MAXFILE
|
||||
# define MAXFILE 9
|
||||
# endif
|
||||
|
||||
# ifndef MAXEXT
|
||||
# define MAXEXT 5
|
||||
# endif
|
||||
|
||||
wxString wxFileSelectorEx( const char* title
|
||||
,const char* defaultDir
|
||||
,const char* defaultFileName
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/app.h"
|
||||
int wxEntry(int argc, char *argv[]);
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
|
||||
@@ -299,7 +299,6 @@ OS2OBJS = \
|
||||
..\os2\$D\checklst.obj \
|
||||
..\os2\$D\choice.obj \
|
||||
..\os2\$D\clipbrd.obj \
|
||||
..\os2\$D\colordlg.obj \
|
||||
..\os2\$D\colour.obj \
|
||||
..\os2\$D\combobox.obj \
|
||||
..\os2\$D\control.obj \
|
||||
@@ -339,7 +338,7 @@ OS2OBJS = \
|
||||
..\os2\$D\ownerdrw.obj \
|
||||
..\os2\$D\palette.obj \
|
||||
..\os2\$D\pen.obj \
|
||||
..\os2\$D\pngread.obj \
|
||||
..\os2\$D\pnghand.obj \
|
||||
..\os2\$D\print.obj \
|
||||
..\os2\$D\radiobox.obj \
|
||||
..\os2\$D\radiobut.obj \
|
||||
@@ -356,7 +355,6 @@ OS2LIBOBJS = \
|
||||
checklst.obj \
|
||||
choice.obj \
|
||||
clipbrd.obj \
|
||||
colordlg.obj \
|
||||
colour.obj \
|
||||
combobox.obj \
|
||||
control.obj \
|
||||
@@ -396,7 +394,7 @@ OS2LIBOBJS = \
|
||||
ownerdrw.obj \
|
||||
palette.obj \
|
||||
pen.obj \
|
||||
pngread.obj \
|
||||
pnghand.obj \
|
||||
print.obj \
|
||||
radiobox.obj \
|
||||
radiobut.obj \
|
||||
@@ -557,7 +555,6 @@ $(OS2LIBOBJS):
|
||||
copy ..\os2\$D\checklst.obj
|
||||
copy ..\os2\$D\choice.obj
|
||||
copy ..\os2\$D\clipbrd.obj
|
||||
copy ..\os2\$D\colordlg.obj
|
||||
copy ..\os2\$D\colour.obj
|
||||
copy ..\os2\$D\combobox.obj
|
||||
copy ..\os2\$D\control.obj
|
||||
@@ -597,7 +594,7 @@ $(OS2LIBOBJS):
|
||||
copy ..\os2\$D\ownerdrw.obj
|
||||
copy ..\os2\$D\pallet.obj
|
||||
copy ..\os2\$D\pen.obj
|
||||
copy ..\os2\$D\pngread.obj
|
||||
copy ..\os2\$D\pnghand.obj
|
||||
copy ..\os2\$D\print.obj
|
||||
copy ..\os2\$D\radiobox.obj
|
||||
copy ..\os2\$D\radiobut.obj
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Name: notebook.cpp
|
||||
// Purpose: implementation of wxNotebook
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Modified by:
|
||||
// Created: 10/12/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) David Webster
|
||||
@@ -115,7 +115,7 @@ bool wxNotebook::Create(wxWindow *parent,
|
||||
return FALSE;
|
||||
|
||||
// colors and font
|
||||
m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
|
||||
// TODO: m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
|
||||
m_foregroundColour = *wxBLACK ;
|
||||
|
||||
// TODO:
|
||||
@@ -139,7 +139,7 @@ bool wxNotebook::Create(wxWindow *parent,
|
||||
tabStyle |= TCS_VERTICAL;
|
||||
if (m_windowStyle & wxNB_RIGHT)
|
||||
tabStyle |= TCS_VERTICAL|TCS_RIGHT;
|
||||
|
||||
|
||||
|
||||
if ( !MSWCreate(GetId(), GetParent(), WC_TABCONTROL,
|
||||
this, NULL, pos.x, pos.y, size.x, size.y,
|
||||
@@ -233,7 +233,7 @@ bool wxNotebook::SetPageImage(int nPage, int nImage)
|
||||
}
|
||||
|
||||
void wxNotebook::SetImageList(wxImageList* imageList)
|
||||
{
|
||||
{
|
||||
m_pImageList = imageList;
|
||||
// TODO
|
||||
}
|
||||
@@ -309,7 +309,7 @@ bool wxNotebook::InsertPage(int nPage,
|
||||
// save the pointer to the page
|
||||
m_aPages.Insert(pPage, nPage);
|
||||
|
||||
// some page must be selected: either this one or the first one if there is
|
||||
// some page must be selected: either this one or the first one if there is
|
||||
// still no selection
|
||||
if ( bSelect )
|
||||
m_nSelection = nPage;
|
||||
@@ -365,7 +365,7 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
|
||||
int sel = event.GetOldSelection();
|
||||
if ( sel != -1 )
|
||||
m_aPages[sel]->Show(FALSE);
|
||||
|
||||
|
||||
sel = event.GetSelection();
|
||||
if ( sel != -1 )
|
||||
{
|
||||
@@ -373,7 +373,7 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
|
||||
pPage->Show(TRUE);
|
||||
pPage->SetFocus();
|
||||
}
|
||||
|
||||
|
||||
m_nSelection = sel;
|
||||
}
|
||||
// we want to give others a chance to process this message as well
|
||||
@@ -440,13 +440,13 @@ bool wxNotebook::OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
|
||||
return wxControl::MSWOnNotify(idCtrl, lParam, result);
|
||||
}
|
||||
*/
|
||||
event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
|
||||
// TODO: event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
|
||||
event.SetOldSelection(m_nSelection);
|
||||
event.SetEventObject(this);
|
||||
event.SetInt(idCtrl);
|
||||
|
||||
bool processed = GetEventHandler()->ProcessEvent(event);
|
||||
*result = !event.IsAllowed();
|
||||
// TODO: *result = !event.IsAllowed();
|
||||
return processed;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
// Name: msw/ownerdrw.cpp
|
||||
// Purpose: implementation of wxOwnerDrawn class
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Modified by:
|
||||
// Created: 10/12/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) David Webster
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
// ctor
|
||||
// ----
|
||||
wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
|
||||
wxOwnerDrawn::wxOwnerDrawn(const wxString& str,
|
||||
bool bCheckable, bool bMenuItem)
|
||||
: m_strName(str)
|
||||
{
|
||||
@@ -100,6 +100,8 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
|
||||
// set the colors
|
||||
// --------------
|
||||
DWORD colBack, colText;
|
||||
// TODO:
|
||||
/*
|
||||
if ( st & wxODSelected ) {
|
||||
colBack = GetSysColor(COLOR_HIGHLIGHT);
|
||||
colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
|
||||
@@ -109,14 +111,14 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
|
||||
colBack = m_colBack.Ok() ? ToRGB(m_colBack) : GetSysColor(COLOR_WINDOW);
|
||||
colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT);
|
||||
}
|
||||
|
||||
dc.SetTextForeground(wxColor(UnRGB(colText)));
|
||||
dc.SetTextBackground(wxColor(UnRGB(colBack)));
|
||||
*/
|
||||
// dc.SetTextForeground(wxColor(UnRGB(colText)));
|
||||
// dc.SetTextBackground(wxColor(UnRGB(colBack)));
|
||||
|
||||
// select the font and draw the text
|
||||
// ---------------------------------
|
||||
|
||||
// determine where to draw and leave space for a check-mark.
|
||||
// determine where to draw and leave space for a check-mark.
|
||||
int x = rc.x + GetMarginWidth();
|
||||
|
||||
dc.SetFont(GetFont());
|
||||
@@ -136,14 +138,10 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
|
||||
RECT rect = { 0, 0, GetMarginWidth(), m_nHeight };
|
||||
|
||||
// finally copy it to screen DC and clean up
|
||||
BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,
|
||||
BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight,
|
||||
hdcMem, 0, 0, SRCCOPY);
|
||||
DeleteDC(hdcMem);
|
||||
*/
|
||||
#else
|
||||
// #### to do: perhaps using Marlett font (create equiv. font under X)
|
||||
// wxFAIL("not implemented");
|
||||
#endif //O_DRAW_NATIVE_API
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -161,22 +159,22 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODSt
|
||||
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
|
||||
|
||||
//MT: blit with mask enabled.
|
||||
dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2,
|
||||
rc.y + (m_nHeight - nBmpHeight) /2,
|
||||
nBmpWidth, nBmpHeight,
|
||||
// TODO:
|
||||
/*
|
||||
dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2,
|
||||
rc.y + (m_nHeight - nBmpHeight) /2,
|
||||
nBmpWidth, nBmpHeight,
|
||||
&dcMem, 0, 0, wxCOPY,true);
|
||||
|
||||
if ( st & wxODSelected ) {
|
||||
// TODO:
|
||||
/*
|
||||
#ifdef O_DRAW_NATIVE_API
|
||||
RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
|
||||
rc.GetLeft() + GetMarginWidth(),
|
||||
RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
|
||||
rc.GetLeft() + GetMarginWidth(),
|
||||
rc.GetTop() + m_nHeight };
|
||||
SetBkColor(hdc, colBack);
|
||||
DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT);
|
||||
*/
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
/*
|
||||
|
||||
@@ -91,6 +91,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
|
||||
M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal);
|
||||
LocalFree((HANDLE)npPal);
|
||||
*/
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
|
||||
|
||||
@@ -133,7 +133,7 @@ bool wxPen::FreeResource(bool force)
|
||||
{
|
||||
if (M_PENDATA && (M_PENDATA->m_hPen != 0))
|
||||
{
|
||||
DeleteObject((HPEN) M_PENDATA->m_hPen);
|
||||
// TODO: DeleteObject((HPEN) M_PENDATA->m_hPen);
|
||||
M_PENDATA->m_hPen = 0;
|
||||
return TRUE;
|
||||
}
|
||||
@@ -160,7 +160,7 @@ void wxPen::SetColour(const wxColour& col)
|
||||
Unshare();
|
||||
|
||||
M_PENDATA->m_colour = col;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@ void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)
|
||||
Unshare();
|
||||
|
||||
M_PENDATA->m_colour.Set(r, g, b);
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ void wxPen::SetStipple(const wxBitmap& Stipple)
|
||||
|
||||
M_PENDATA->m_stipple = Stipple;
|
||||
M_PENDATA->m_style = wxSTIPPLE;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
@@ -207,7 +207,7 @@ void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
|
||||
|
||||
M_PENDATA->m_nbDash = nb_dashes;
|
||||
M_PENDATA->m_dash = (wxDash *)Dash;
|
||||
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
@@ -229,22 +229,13 @@ void wxPen::SetCap(int Cap)
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
void wxPen::SetCap(int Cap)
|
||||
{
|
||||
Unshare();
|
||||
|
||||
M_PENDATA->m_cap = Cap;
|
||||
|
||||
RealizeResource();
|
||||
}
|
||||
|
||||
int wx2os2PenStyle(int wx_style)
|
||||
{
|
||||
int cstyle;
|
||||
// TODO:
|
||||
/*
|
||||
switch (wx_style)
|
||||
{
|
||||
{
|
||||
case wxDOT:
|
||||
cstyle = PS_DOT;
|
||||
break;
|
||||
|
||||
@@ -29,8 +29,7 @@
|
||||
#include "wx/palette.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/msw/pngread.h"
|
||||
#include "wx/msw/dibutils.h"
|
||||
#include "wx/os2/pngread.h"
|
||||
|
||||
extern "C" {
|
||||
#include "../png/png.h"
|
||||
@@ -116,18 +115,14 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
|
||||
ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0);
|
||||
|
||||
if (lpbi) {
|
||||
#ifdef __WIN16__
|
||||
GlobalFreePtr((unsigned int) lpbi);
|
||||
#else
|
||||
GlobalFreePtr(lpbi);
|
||||
#endif
|
||||
// GlobalFreePtr(lpbi);
|
||||
// delete Palette;
|
||||
}
|
||||
RawImage = 0;
|
||||
Palette = 0;
|
||||
lpbi = wxDibCreate(Depth, Width, Height);
|
||||
lpbi = 0; // TODO: wxDibCreate(Depth, Width, Height);
|
||||
if (lpbi) {
|
||||
RawImage = (ImagePointerType)wxDibPtr(lpbi);
|
||||
RawImage = 0; //TODO: (ImagePointerType)wxDibPtr(lpbi);
|
||||
EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4;
|
||||
imageOK = TRUE;
|
||||
}
|
||||
@@ -136,11 +131,7 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
|
||||
wxPNGReader::~wxPNGReader ( )
|
||||
{
|
||||
if (lpbi) {
|
||||
#ifdef __WIN16__
|
||||
GlobalFreePtr((unsigned int) lpbi);
|
||||
#else
|
||||
GlobalFreePtr(lpbi);
|
||||
#endif
|
||||
// TODO: GlobalFreePtr(lpbi);
|
||||
delete Palette;
|
||||
}
|
||||
}
|
||||
@@ -211,7 +202,8 @@ bool wxPNGReader::SetPalette(wxPalette* colourmap)
|
||||
return FALSE;
|
||||
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
|
||||
Palette = colourmap;
|
||||
return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
|
||||
// TODO: return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -225,7 +217,8 @@ wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b)
|
||||
if (!b) b = g;
|
||||
Palette->Create(n, r, g, b);
|
||||
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
|
||||
return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
|
||||
// TODO: return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -251,7 +244,8 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
|
||||
|
||||
Palette->Create(n, r, g, b);
|
||||
ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
|
||||
return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
|
||||
// TODO: return (wxDibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void wxPNGReader::NullData()
|
||||
@@ -274,6 +268,8 @@ wxBitmap* wxPNGReader::GetBitmap()
|
||||
|
||||
bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
|
||||
{
|
||||
// TODO:
|
||||
/*
|
||||
HDC dc = ::CreateCompatibleDC(NULL);
|
||||
|
||||
if (dc)
|
||||
@@ -327,14 +323,17 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
*/
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
wxPalette *wxCopyPalette(const wxPalette *cmap)
|
||||
{
|
||||
// To get number of entries...
|
||||
WORD count = 0;
|
||||
::GetObject((HPALETTE) cmap->GetHPALETTE(), sizeof(WORD), &count);
|
||||
|
||||
// TODO: ::GetObject((HPALETTE) cmap->GetHPALETTE(), sizeof(WORD), &count);
|
||||
// TODO:
|
||||
/*
|
||||
LOGPALETTE* logPal = (LOGPALETTE*)
|
||||
new BYTE[sizeof(LOGPALETTE) + count*sizeof(PALETTEENTRY)];
|
||||
logPal->palVersion = 0x300;
|
||||
@@ -343,14 +342,16 @@ wxPalette *wxCopyPalette(const wxPalette *cmap)
|
||||
|
||||
HPALETTE hPalette = ::CreatePalette(logPal);
|
||||
delete[] logPal;
|
||||
|
||||
*/
|
||||
wxPalette *newCmap = new wxPalette;
|
||||
newCmap->SetHPALETTE((WXHPALETTE) hPalette);
|
||||
// TODO: newCmap->SetHPALETTE((WXHPALETTE) hPalette);
|
||||
return newCmap;
|
||||
}
|
||||
|
||||
wxMask *wxPNGReader::CreateMask()
|
||||
{
|
||||
// TODO:
|
||||
/*
|
||||
HBITMAP hBitmap = ::CreateBitmap(GetWidth(), GetHeight(), 1, 1, NULL);
|
||||
|
||||
HDC dc = ::CreateCompatibleDC(NULL);
|
||||
@@ -373,8 +374,9 @@ wxMask *wxPNGReader::CreateMask()
|
||||
}
|
||||
}
|
||||
::SelectObject(dc, oldBitmap);
|
||||
*/
|
||||
wxMask *mask = new wxMask;
|
||||
mask->SetMaskBitmap((WXHBITMAP) hBitmap);
|
||||
// TODO: mask->SetMaskBitmap((WXHBITMAP) hBitmap);
|
||||
return mask;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user