*** empty log message ***
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -9,13 +9,19 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "accel.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include <stdio.h>
|
||||
#include "wx/setup.h"
|
||||
#include "wx/window.h"
|
||||
#endif
|
||||
|
||||
#include "wx/setup.h"
|
||||
#include "wx/accel.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/os2/accel.h"
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
|
||||
#if !USE_SHARED_LIBRARIES
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
|
||||
@@ -28,11 +34,9 @@ public:
|
||||
wxAcceleratorRefData();
|
||||
~wxAcceleratorRefData();
|
||||
|
||||
/* TODO: implementation
|
||||
inline HACCEL GetHACCEL() const { return m_hAccel; }
|
||||
protected:
|
||||
HACCEL m_hAccel;
|
||||
*/
|
||||
};
|
||||
|
||||
#define M_ACCELDATA ((wxAcceleratorRefData *)m_refData)
|
||||
@@ -91,3 +95,29 @@ bool wxAcceleratorTable::Ok() const
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
void wxAcceleratorTable::SetHACCEL(WXHACCEL hAccel)
|
||||
{
|
||||
if (!M_ACCELDATA)
|
||||
m_refData = new wxAcceleratorRefData;
|
||||
|
||||
M_ACCELDATA->m_hAccel = (HACCEL) hAccel;
|
||||
}
|
||||
|
||||
WXHACCEL wxAcceleratorTable::GetHACCEL() const
|
||||
{
|
||||
if (!M_ACCELDATA)
|
||||
return 0;
|
||||
return (WXHACCEL) M_ACCELDATA->m_hAccel;
|
||||
}
|
||||
|
||||
bool wxAcceleratorTable::Translate(wxWindow *window, WXMSG *wxmsg) const
|
||||
{
|
||||
// TODO:
|
||||
/*
|
||||
MSG *msg = (MSG *)wxmsg;
|
||||
|
||||
return Ok() && ::TranslateAccelerator(GetHwndOf(window), GetHaccel(), msg);
|
||||
*/
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,12 +1,12 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: main.cpp
|
||||
// Purpose: Entry point
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Created: 10/10/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "wx/app.h"
|
||||
|
@@ -326,9 +326,15 @@ OS2OBJS = \
|
||||
..\os2\$D\iniconf.obj \
|
||||
..\os2\$D\joystick.obj \
|
||||
..\os2\$D\listbox.obj \
|
||||
..\os2\$D\listctrl.obj \
|
||||
..\os2\$D\main.obj \
|
||||
..\os2\$D\mdi.obj \
|
||||
..\os2\$D\menu.obj \
|
||||
..\os2\$D\menuitem.obj \
|
||||
..\os2\$D\metafile.obj \
|
||||
..\os2\$D\minifram.obj \
|
||||
..\os2\$D\window.obj
|
||||
|
||||
|
||||
OS2LIBOBJS = \
|
||||
accel.obj \
|
||||
app.obj \
|
||||
@@ -367,6 +373,13 @@ OS2LIBOBJS = \
|
||||
iniconf.obj \
|
||||
joystick.obj \
|
||||
listbox.obj \
|
||||
listctrl.obj \
|
||||
main.obj \
|
||||
mdi.obj \
|
||||
menu.obj \
|
||||
menuitem.obj \
|
||||
metafile.obj \
|
||||
minifram.obj \
|
||||
window.obj
|
||||
|
||||
HTMLOBJS = \
|
||||
@@ -551,6 +564,13 @@ $(OS2LIBOBJS):
|
||||
copy ..\os2\$D\iniconf.obj
|
||||
copy ..\os2\$D\joystick.obj
|
||||
copy ..\os2\$D\listbox.obj
|
||||
copy ..\os2\$D\listctrl.obj
|
||||
copy ..\os2\$D\main.obj
|
||||
copy ..\os2\$D\mdi.obj
|
||||
copy ..\os2\$D\menu.obj
|
||||
copy ..\os2\$D\menuitem.obj
|
||||
copy ..\os2\$D\metafile.obj
|
||||
copy ..\os2\$D\minifram.obj
|
||||
copy ..\os2\$D\window.obj
|
||||
|
||||
# wxWindows library as DLL
|
||||
|
1153
src/os2/mdi.cpp
1153
src/os2/mdi.cpp
File diff suppressed because it is too large
Load Diff
1158
src/os2/menu.cpp
1158
src/os2/menu.cpp
File diff suppressed because it is too large
Load Diff
@@ -1,11 +1,11 @@
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Name: menuitem.cpp
|
||||
// Purpose: wxMenuItem implementation
|
||||
// Author: AUTHOR
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: 10/10/98
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -13,8 +13,31 @@
|
||||
// headers & declarations
|
||||
// ============================================================================
|
||||
|
||||
#include "wx/menu.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/font.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/settings.h"
|
||||
#include "wx/font.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/accel.h"
|
||||
#include "wx/menu.h"
|
||||
#include "wx/string.h"
|
||||
#endif
|
||||
|
||||
#include "wx/ownerdrw.h"
|
||||
#include "wx/menuitem.h"
|
||||
#include "wx/log.h"
|
||||
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// convenience macro
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
#define GetHMenuOf(menu) ((HMENU)menu->GetHMenu())
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
@@ -24,8 +47,13 @@
|
||||
// dynamic classes implementation
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
#if !defined(USE_SHARED_LIBRARY) || !USE_SHARED_LIBRARY
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
IMPLEMENT_DYNAMIC_CLASS2(wxMenuItem, wxObject, wxOwnerDrawn)
|
||||
#else //!USE_OWNER_DRAWN
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
|
||||
#endif //USE_OWNER_DRAWN
|
||||
|
||||
#endif //USE_SHARED_LIBRARY
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -39,32 +67,55 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu, int id,
|
||||
const wxString& strName, const wxString& strHelp,
|
||||
bool bCheckable,
|
||||
wxMenu *pSubMenu) :
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
wxOwnerDrawn(strName, bCheckable),
|
||||
#else //no owner drawn support
|
||||
m_bCheckable(bCheckable),
|
||||
m_strName(strName),
|
||||
#endif //owner drawn
|
||||
m_strHelp(strHelp)
|
||||
{
|
||||
wxASSERT( pParentMenu != NULL );
|
||||
wxASSERT_MSG( pParentMenu != NULL, wxT("a menu item should have a parent") );
|
||||
|
||||
m_pParentMenu = pParentMenu;
|
||||
m_pSubMenu = pSubMenu;
|
||||
m_idItem = id;
|
||||
m_bEnabled = TRUE;
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
// set default menu colors
|
||||
#define SYS_COLOR(c) (wxSystemSettings::GetSystemColour(wxSYS_COLOUR_##c))
|
||||
|
||||
SetTextColour(SYS_COLOR(MENUTEXT));
|
||||
SetBackgroundColour(SYS_COLOR(MENU));
|
||||
|
||||
// we don't want normal items be owner-drawn
|
||||
ResetOwnerDrawn();
|
||||
|
||||
#undef SYS_COLOR
|
||||
#endif
|
||||
|
||||
m_pParentMenu = pParentMenu;
|
||||
m_pSubMenu = pSubMenu;
|
||||
m_bEnabled = TRUE;
|
||||
m_bChecked = FALSE;
|
||||
m_idItem = id;
|
||||
}
|
||||
|
||||
wxMenuItem::~wxMenuItem()
|
||||
wxMenuItem::~wxMenuItem()
|
||||
{
|
||||
}
|
||||
|
||||
// misc
|
||||
// ----
|
||||
|
||||
// return the id for calling Win32 API functions
|
||||
int wxMenuItem::GetRealId() const
|
||||
{
|
||||
return m_pSubMenu ? (int)m_pSubMenu->GetHMenu() : GetId();
|
||||
}
|
||||
|
||||
// delete the sub menu
|
||||
// -------------------
|
||||
void wxMenuItem::DeleteSubMenu()
|
||||
{
|
||||
wxASSERT( m_pSubMenu != NULL );
|
||||
|
||||
delete m_pSubMenu;
|
||||
m_pSubMenu = NULL;
|
||||
delete m_pSubMenu;
|
||||
m_pSubMenu = NULL;
|
||||
}
|
||||
|
||||
// change item state
|
||||
@@ -72,24 +123,93 @@ void wxMenuItem::DeleteSubMenu()
|
||||
|
||||
void wxMenuItem::Enable(bool bDoEnable)
|
||||
{
|
||||
if ( m_bEnabled != bDoEnable ) {
|
||||
if ( m_pSubMenu == NULL ) { // normal menu item
|
||||
// TODO
|
||||
}
|
||||
else // submenu
|
||||
{
|
||||
// TODO
|
||||
}
|
||||
// TODO:
|
||||
/*
|
||||
if ( m_bEnabled != bDoEnable ) {
|
||||
long rc = EnableMenuItem(GetHMenuOf(m_pParentMenu),
|
||||
GetRealId(),
|
||||
MF_BYCOMMAND |
|
||||
(bDoEnable ? MF_ENABLED : MF_GRAYED));
|
||||
|
||||
m_bEnabled = bDoEnable;
|
||||
}
|
||||
if ( rc == -1 ) {
|
||||
wxLogLastError("EnableMenuItem");
|
||||
}
|
||||
|
||||
m_bEnabled = bDoEnable;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void wxMenuItem::Check(bool bDoCheck)
|
||||
{
|
||||
wxCHECK_RET( IsCheckable(), "only checkable items may be checked" );
|
||||
wxCHECK_RET( IsCheckable(), wxT("only checkable items may be checked") );
|
||||
|
||||
// TODO:
|
||||
/*
|
||||
if ( m_bChecked != bDoCheck ) {
|
||||
long rc = CheckMenuItem(GetHMenuOf(m_pParentMenu),
|
||||
GetId(),
|
||||
MF_BYCOMMAND |
|
||||
(bDoCheck ? MF_CHECKED : MF_UNCHECKED));
|
||||
|
||||
if ( rc == -1 ) {
|
||||
wxLogLastError("CheckMenuItem");
|
||||
}
|
||||
|
||||
m_bChecked = bDoCheck;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
void wxMenuItem::SetName(const wxString& strName)
|
||||
{
|
||||
// don't do anything if label didn't change
|
||||
if ( m_strName == strName )
|
||||
return;
|
||||
|
||||
m_strName = strName;
|
||||
|
||||
HMENU hMenu = GetHMenuOf(m_pParentMenu);
|
||||
|
||||
UINT id = GetRealId();
|
||||
|
||||
// TODO:
|
||||
/*
|
||||
UINT flagsOld = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
|
||||
if ( flagsOld == 0xFFFFFFFF )
|
||||
{
|
||||
wxLogLastError("GetMenuState");
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( IsSubMenu() )
|
||||
{
|
||||
// high byte contains the number of items in a submenu for submenus
|
||||
flagsOld &= 0xFF;
|
||||
flagsOld |= MF_POPUP;
|
||||
}
|
||||
|
||||
LPCTSTR data;
|
||||
#if wxUSE_OWNER_DRAWN
|
||||
if ( IsOwnerDrawn() )
|
||||
{
|
||||
flagsOld |= MF_OWNERDRAW;
|
||||
data = (LPCTSTR)this;
|
||||
}
|
||||
else
|
||||
#endif //owner drawn
|
||||
{
|
||||
flagsOld |= MF_STRING;
|
||||
data = strName;
|
||||
}
|
||||
|
||||
if ( ::ModifyMenu(hMenu, id,
|
||||
MF_BYCOMMAND | flagsOld,
|
||||
id, data) == 0xFFFFFFFF )
|
||||
{
|
||||
wxLogLastError(wxT("ModifyMenu"));
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
if ( m_bChecked != bDoCheck ) {
|
||||
// TODO
|
||||
m_bChecked = bDoCheck;
|
||||
}
|
||||
|
@@ -1,58 +1,122 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: metafile.cpp
|
||||
// Purpose: wxMetaFile, wxMetaFileDC etc. These classes are optional.
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: 04/01/98
|
||||
// Created: 10/10/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "metafile.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/setup.h"
|
||||
#endif
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/dc.h"
|
||||
#include "wx/stubs/metafile.h"
|
||||
#if wxUSE_METAFILE
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/utils.h"
|
||||
#include "wx/app.h"
|
||||
#endif
|
||||
|
||||
#include "wx/metafile.h"
|
||||
#include "wx/clipbrd.h"
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
extern bool wxClipboardIsOpen;
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMetafile, wxObject)
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxMetafileDC, wxDC)
|
||||
#endif
|
||||
|
||||
wxMetaFile::wxMetaFile(const wxString& file)
|
||||
/*
|
||||
* Metafiles
|
||||
* Currently, the only purpose for making a metafile is to put
|
||||
* it on the clipboard.
|
||||
*/
|
||||
|
||||
wxMetafileRefData::wxMetafileRefData(void)
|
||||
{
|
||||
// TODO
|
||||
m_metafile = 0;
|
||||
m_windowsMappingMode = wxMM_ANISOTROPIC;
|
||||
}
|
||||
|
||||
wxMetaFile::~wxMetaFile()
|
||||
wxMetafileRefData::~wxMetafileRefData(void)
|
||||
{
|
||||
// TODO
|
||||
if (m_metafile)
|
||||
{
|
||||
// TODO: DeleteMetaFile((HMETAFILE) m_metafile);
|
||||
m_metafile = 0;
|
||||
}
|
||||
}
|
||||
|
||||
bool wxMetaFile::SetClipboard(int width, int height)
|
||||
wxMetafile::wxMetafile(const wxString& file)
|
||||
{
|
||||
m_refData = new wxMetafileRefData;
|
||||
|
||||
M_METAFILEDATA->m_windowsMappingMode = wxMM_ANISOTROPIC;
|
||||
M_METAFILEDATA->m_metafile = 0;
|
||||
if (!file.IsNull() && (file.Cmp(wxT("")) == 0))
|
||||
M_METAFILEDATA->m_metafile = (WXHANDLE)0; // TODO: GetMetaFile(file);
|
||||
}
|
||||
|
||||
wxMetafile::~wxMetafile(void)
|
||||
{
|
||||
}
|
||||
|
||||
bool wxMetafile::SetClipboard(int width, int height)
|
||||
{
|
||||
if (!m_refData)
|
||||
return FALSE;
|
||||
|
||||
bool alreadyOpen=wxClipboardOpen();
|
||||
if (!alreadyOpen)
|
||||
{
|
||||
wxOpenClipboard();
|
||||
if (!wxEmptyClipboard()) return FALSE;
|
||||
}
|
||||
bool success = wxSetClipboardData(wxDF_METAFILE,this, width,height);
|
||||
bool success = wxSetClipboardData(wxDF_METAFILE, this, width,height);
|
||||
if (!alreadyOpen) wxCloseClipboard();
|
||||
return (bool) success;
|
||||
}
|
||||
|
||||
bool wxMetaFile::Play(wxDC *dc)
|
||||
bool wxMetafile::Play(wxDC *dc)
|
||||
{
|
||||
// TODO
|
||||
return FALSE;
|
||||
if (!m_refData)
|
||||
return FALSE;
|
||||
|
||||
dc->BeginDrawing();
|
||||
|
||||
// if (dc->GetHDC() && M_METAFILEDATA->m_metafile)
|
||||
// PlayMetaFile((HDC) dc->GetHDC(), (HMETAFILE) M_METAFILEDATA->m_metafile);
|
||||
|
||||
dc->EndDrawing();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void wxMetafile::SetHMETAFILE(WXHANDLE mf)
|
||||
{
|
||||
if (m_refData)
|
||||
m_refData = new wxMetafileRefData;
|
||||
|
||||
M_METAFILEDATA->m_metafile = mf;
|
||||
}
|
||||
|
||||
void wxMetafile::SetWindowsMappingMode(int mm)
|
||||
{
|
||||
if (m_refData)
|
||||
m_refData = new wxMetafileRefData;
|
||||
|
||||
M_METAFILEDATA->m_windowsMappingMode = mm;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -61,41 +125,155 @@ bool wxMetaFile::Play(wxDC *dc)
|
||||
*/
|
||||
|
||||
// Original constructor that does not takes origin and extent. If you use this,
|
||||
// *DO* give origin/extent arguments to wxMakeMetaFilePlaceable.
|
||||
wxMetaFileDC::wxMetaFileDC(const wxString& file)
|
||||
// *DO* give origin/extent arguments to wxMakeMetafilePlaceable.
|
||||
wxMetafileDC::wxMetafileDC(const wxString& file)
|
||||
{
|
||||
// TODO
|
||||
m_metaFile = NULL;
|
||||
m_minX = 10000;
|
||||
m_minY = 10000;
|
||||
m_maxX = -10000;
|
||||
m_maxY = -10000;
|
||||
// m_title = NULL;
|
||||
|
||||
if (!file.IsNull() && wxFileExists(file))
|
||||
wxRemoveFile(file);
|
||||
|
||||
// TODO
|
||||
/*
|
||||
if (!file.IsNull() && (file != wxT("")))
|
||||
m_hDC = (WXHDC) CreateMetaFile(file);
|
||||
else
|
||||
m_hDC = (WXHDC) CreateMetaFile(NULL);
|
||||
*/
|
||||
|
||||
m_ok = (m_hDC != (WXHDC) 0) ;
|
||||
|
||||
// Actual Windows mapping mode, for future reference.
|
||||
m_windowsMappingMode = wxMM_TEXT;
|
||||
|
||||
SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
|
||||
}
|
||||
|
||||
// New constructor that takes origin and extent. If you use this, don't
|
||||
// give origin/extent arguments to wxMakeMetaFilePlaceable.
|
||||
wxMetaFileDC::wxMetaFileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
|
||||
// give origin/extent arguments to wxMakeMetafilePlaceable.
|
||||
wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
|
||||
{
|
||||
// TODO
|
||||
m_minX = 10000;
|
||||
m_minY = 10000;
|
||||
m_maxX = -10000;
|
||||
m_maxY = -10000;
|
||||
if (file != wxT("") && wxFileExists(file)) wxRemoveFile(file);
|
||||
// m_hDC = (WXHDC) CreateMetaFile(file);
|
||||
|
||||
m_ok = TRUE;
|
||||
|
||||
// ::SetWindowOrgEx((HDC) m_hDC,xorg,yorg, NULL);
|
||||
// ::SetWindowExtEx((HDC) m_hDC,xext,yext, NULL);
|
||||
|
||||
// Actual Windows mapping mode, for future reference.
|
||||
m_windowsMappingMode = wxMM_ANISOTROPIC;
|
||||
|
||||
SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
|
||||
}
|
||||
|
||||
wxMetaFileDC::~wxMetaFileDC()
|
||||
wxMetafileDC::~wxMetafileDC(void)
|
||||
{
|
||||
m_hDC = 0;
|
||||
}
|
||||
|
||||
void wxMetaFileDC::GetTextExtent(const wxString& string, float *x, float *y,
|
||||
float *descent, float *externalLeading, wxFont *theFont, bool use16bit)
|
||||
void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
|
||||
long *descent, long *externalLeading, wxFont *theFont, bool use16bit) const
|
||||
{
|
||||
// TODO
|
||||
wxFont *fontToUse = theFont;
|
||||
if (!fontToUse)
|
||||
fontToUse = (wxFont*) &m_font;
|
||||
|
||||
// TODO:
|
||||
/*
|
||||
HDC dc = GetDC(NULL);
|
||||
|
||||
SIZE sizeRect;
|
||||
TEXTMETRIC tm;
|
||||
GetTextExtentPoint(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
|
||||
GetTextMetrics(dc, &tm);
|
||||
|
||||
ReleaseDC(NULL, dc);
|
||||
|
||||
if ( x )
|
||||
*x = sizeRect.cx;
|
||||
if ( y )
|
||||
*y = sizeRect.cy;
|
||||
if ( descent )
|
||||
*descent = tm.tmDescent;
|
||||
if ( externalLeading )
|
||||
*externalLeading = tm.tmExternalLeading;
|
||||
*/
|
||||
}
|
||||
|
||||
wxMetaFile *wxMetaFileDC::Close()
|
||||
wxMetafile *wxMetafileDC::Close(void)
|
||||
{
|
||||
// TODO
|
||||
return NULL;
|
||||
SelectOldObjects(m_hDC);
|
||||
HANDLE mf = 0; // TODO: CloseMetaFile((HDC) m_hDC);
|
||||
m_hDC = 0;
|
||||
if (mf)
|
||||
{
|
||||
wxMetafile *wx_mf = new wxMetafile;
|
||||
wx_mf->SetHMETAFILE((WXHANDLE) mf);
|
||||
wx_mf->SetWindowsMappingMode(m_windowsMappingMode);
|
||||
return wx_mf;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void wxMetaFileDC::SetMapMode(int mode)
|
||||
void wxMetafileDC::SetMapMode(int mode)
|
||||
{
|
||||
// TODO
|
||||
}
|
||||
m_mappingMode = mode;
|
||||
|
||||
#if 0
|
||||
// int pixel_width = 0;
|
||||
// int pixel_height = 0;
|
||||
// int mm_width = 0;
|
||||
// int mm_height = 0;
|
||||
|
||||
float mm2pixelsX = 10.0;
|
||||
float mm2pixelsY = 10.0;
|
||||
|
||||
switch (mode)
|
||||
{
|
||||
case wxMM_TWIPS:
|
||||
{
|
||||
m_logicalScaleX = (float)(twips2mm * mm2pixelsX);
|
||||
m_logicalScaleY = (float)(twips2mm * mm2pixelsY);
|
||||
break;
|
||||
}
|
||||
case wxMM_POINTS:
|
||||
{
|
||||
m_logicalScaleX = (float)(pt2mm * mm2pixelsX);
|
||||
m_logicalScaleY = (float)(pt2mm * mm2pixelsY);
|
||||
break;
|
||||
}
|
||||
case wxMM_METRIC:
|
||||
{
|
||||
m_logicalScaleX = mm2pixelsX;
|
||||
m_logicalScaleY = mm2pixelsY;
|
||||
break;
|
||||
}
|
||||
case wxMM_LOMETRIC:
|
||||
{
|
||||
m_logicalScaleX = (float)(mm2pixelsX/10.0);
|
||||
m_logicalScaleY = (float)(mm2pixelsY/10.0);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
case wxMM_TEXT:
|
||||
{
|
||||
m_logicalScaleX = 1.0;
|
||||
m_logicalScaleY = 1.0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
m_windowExtX = 100;
|
||||
m_windowExtY = 100;
|
||||
}
|
||||
|
||||
#ifdef __WIN32__
|
||||
struct RECT32
|
||||
@@ -131,41 +309,43 @@ struct mfPLACEABLEHEADER {
|
||||
* and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.
|
||||
*
|
||||
*/
|
||||
|
||||
bool wxMakeMetaFilePlaceable(const wxString& filename, float scale)
|
||||
|
||||
bool wxMakeMetafilePlaceable(const wxString& filename, float scale)
|
||||
{
|
||||
return wxMakeMetaFilePlaceable(filename, 0, 0, 0, 0, scale, FALSE);
|
||||
return wxMakeMetafilePlaceable(filename, 0, 0, 0, 0, scale, FALSE);
|
||||
}
|
||||
|
||||
bool wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale, bool useOriginAndExtent)
|
||||
bool wxMakeMetafilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale, bool useOriginAndExtent)
|
||||
{
|
||||
// TODO: the OS/2 PM/MM way to do this
|
||||
/*
|
||||
// I'm not sure if this is the correct way of suggesting a scale
|
||||
// to the client application, but it's the only way I can find.
|
||||
int unitsPerInch = (int)(576/scale);
|
||||
|
||||
|
||||
mfPLACEABLEHEADER header;
|
||||
header.key = 0x9AC6CDD7L;
|
||||
header.hmf = 0;
|
||||
header.bbox.left = (int)(x1);
|
||||
header.bbox.top = (int)(y1);
|
||||
header.bbox.right = (int)(x2);
|
||||
header.bbox.bottom = (int)(y2);
|
||||
header.bbox.xLeft = (int)(x1);
|
||||
header.bbox.yTop = (int)(y1);
|
||||
header.bbox.xRight = (int)(x2);
|
||||
header.bbox.yBottom = (int)(y2);
|
||||
header.inch = unitsPerInch;
|
||||
header.reserved = 0;
|
||||
|
||||
// Calculate checksum
|
||||
// Calculate checksum
|
||||
WORD *p;
|
||||
mfPLACEABLEHEADER *pMFHead = &header;
|
||||
for (p =(WORD *)pMFHead,pMFHead -> checksum = 0;
|
||||
p < (WORD *)&pMFHead ->checksum; ++p)
|
||||
pMFHead ->checksum ^= *p;
|
||||
|
||||
FILE *fd = fopen((char *)(const char *)filename, "rb");
|
||||
FILE *fd = fopen(filename.fn_str(), "rb");
|
||||
if (!fd) return FALSE;
|
||||
|
||||
char tempFileBuf[256];
|
||||
wxGetTempFileName("mf", tempFileBuf);
|
||||
FILE *fHandle = fopen(tempFileBuf, "wb");
|
||||
|
||||
wxChar tempFileBuf[256];
|
||||
wxGetTempFileName(wxT("mf"), tempFileBuf);
|
||||
FILE *fHandle = fopen(wxConvFile.cWX2MB(tempFileBuf), "wb");
|
||||
if (!fHandle)
|
||||
return FALSE;
|
||||
fwrite((void *)&header, sizeof(unsigned char), sizeof(mfPLACEABLEHEADER), fHandle);
|
||||
@@ -179,12 +359,12 @@ bool wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, i
|
||||
// Read metafile header and write
|
||||
METAHEADER metaHeader;
|
||||
fread((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fd);
|
||||
|
||||
|
||||
if (useOriginAndExtent)
|
||||
metaHeader.mtSize += 15;
|
||||
else
|
||||
metaHeader.mtSize += 5;
|
||||
|
||||
|
||||
fwrite((void *)&metaHeader, sizeof(unsigned char), sizeof(metaHeader), fHandle);
|
||||
|
||||
// Write SetMapMode, SetWindowOrigin and SetWindowExt records
|
||||
@@ -211,7 +391,7 @@ bool wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, i
|
||||
extentRecord->rdParm[1] = extentX;
|
||||
|
||||
fwrite((void *)modeBuffer, sizeof(char), 8, fHandle);
|
||||
|
||||
|
||||
if (useOriginAndExtent)
|
||||
{
|
||||
fwrite((void *)originBuffer, sizeof(char), 10, fHandle);
|
||||
@@ -232,8 +412,9 @@ bool wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, i
|
||||
wxRemoveFile(filename);
|
||||
wxCopyFile(tempFileBuf, filename);
|
||||
wxRemoveFile(tempFileBuf);
|
||||
*/
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif // wxUSE_METAFILE
|
||||
|
||||
|
@@ -1,16 +1,25 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: minifram.cpp
|
||||
// Purpose: wxMiniFrame. Optional; identical to wxFrame if not supported.
|
||||
// Author: AUTHOR
|
||||
// Author: David Webster
|
||||
// Modified by:
|
||||
// Created: ??/??/98
|
||||
// Created: 10/10/99
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) AUTHOR
|
||||
// Licence: wxWindows licence
|
||||
// Copyright: (c) David Webster
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma implementation "minifram.h"
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#include "wx/window.h"
|
||||
#include "wx/os2/private.h"
|
||||
|
||||
#ifndef WX_PRECOMP
|
||||
#include "wx/setup.h"
|
||||
#include "wx/event.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/utils.h"
|
||||
#endif
|
||||
|
||||
#include "wx/minifram.h"
|
||||
@@ -19,4 +28,3 @@
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame, wxFrame)
|
||||
#endif
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user