// macros
// ----------------------------------------------------------------------------
-#if !defined(__VISAGECPP__)
-// VZ: this is ugly (FIXME)
#define M_FONTDATA GetFontData()
-#endif
#endif
// _WX_FONT_H_BASE_
# define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog
#elif defined(__WXPM__)
-#include "wx/generic/fontdlgg.h"
-# define wxFontDialog wxGenericFontDialog
-# define sm_classwxFontDialog sm_classwxGenericFontDialog
+#include "wx/os2/fontdlg.h"
#elif defined(__WXSTUBS__)
#include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog
/////////////////////////////////////////////////////////////////////////////
// Name: font.h
// Purpose: wxFont class
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/06/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FONT_H_
#define _WX_FONT_H_
-#ifdef __GNUG__
-#pragma interface "font.h"
-#endif
-
#include "wx/gdiobj.h"
-class WXDLLEXPORT wxFont;
+WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
+
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxFontRefData: public wxGDIRefData
+class WXDLLEXPORT wxFont : public wxFontBase
{
- friend class WXDLLEXPORT wxFont;
public:
- wxFontRefData();
- wxFontRefData(const wxFontRefData& data);
- ~wxFontRefData();
-protected:
- int m_pointSize;
- int m_family;
- int m_style;
- int m_weight;
- bool m_underlined;
- wxString m_faceName;
-/* TODO: implementation
- WXHFONT m_hFont;
-*/
-};
+ // ctors and such
+ wxFont() { Init(); }
+ wxFont(const wxFont& font) { Init(); Ref(font); }
+
+ wxFont(int size,
+ int family,
+ int style,
+ int weight,
+ bool underlined = FALSE,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+ {
+ Init();
+
+ (void)Create(size, family, style, weight, underlined, face, encoding);
+ }
+
+ bool Create(int size,
+ int family,
+ int style,
+ int weight,
+ bool underlined = FALSE,
+ const wxString& face = wxEmptyString,
+ wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
+
+ virtual ~wxFont();
+
+ // assignment
+ wxFont& operator=(const wxFont& font);
+
+ // implement base class pure virtuals
+ virtual int GetPointSize() const;
+ virtual int GetFamily() const;
+ virtual int GetStyle() const;
+ virtual int GetWeight() const;
+ virtual bool GetUnderlined() const;
+ virtual wxString GetFaceName() const;
+ virtual wxFontEncoding GetEncoding() const;
+
+ virtual void SetPointSize(int pointSize);
+ virtual void SetFamily(int family);
+ virtual void SetStyle(int style);
+ virtual void SetWeight(int weight);
+ virtual void SetFaceName(const wxString& faceName);
+ virtual void SetUnderlined(bool underlined);
+ virtual void SetEncoding(wxFontEncoding encoding);
+
+ // implementation only from now on
+ // -------------------------------
+
+ int GetFontId() const;
+ virtual bool IsFree() const;
+ virtual bool RealizeResource();
+ virtual WXHANDLE GetResourceHandle();
+ virtual bool FreeResource(bool force = FALSE);
+ /*
+ virtual bool UseResource();
+ virtual bool ReleaseResource();
+ */
-#define M_FONTDATA ((wxFontRefData *)m_refData)
+protected:
+ // common part of all ctors
+ void Init();
-WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+ void Unshare();
-// Font
-class WXDLLEXPORT wxFont: public wxGDIObject
-{
- DECLARE_DYNAMIC_CLASS(wxFont)
-public:
- wxFont();
- wxFont(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
- inline wxFont(const wxFont& font) { Ref(font); }
-
- ~wxFont();
-
- bool Create(int pointSize, int family, int style, int weight, bool underlined = FALSE, const wxString& faceName = wxEmptyString);
-
- virtual bool Ok() const { return (m_refData != NULL) ; }
-
- inline int GetPointSize() const { return M_FONTDATA->m_pointSize; }
- inline int GetFamily() const { return M_FONTDATA->m_family; }
- inline int GetStyle() const { return M_FONTDATA->m_style; }
- inline int GetWeight() const { return M_FONTDATA->m_weight; }
- wxString GetFamilyString() const ;
- wxString GetFaceName() const ;
- wxString GetStyleString() const ;
- wxString GetWeightString() const ;
- inline bool GetUnderlined() const { return M_FONTDATA->m_underlined; }
-
- void SetPointSize(int pointSize);
- void SetFamily(int family);
- void SetStyle(int style);
- void SetWeight(int weight);
- void SetFaceName(const wxString& faceName);
- void SetUnderlined(bool underlined);
-
- inline wxFont& operator = (const wxFont& font) { if (*this == font) return (*this); Ref(font); return *this; }
- inline bool operator == (const wxFont& font) { return m_refData == font.m_refData; }
- inline bool operator != (const wxFont& font) { return m_refData != font.m_refData; }
-
- // Implementation
-protected:
- bool RealizeResource();
- void Unshare();
+private:
+ DECLARE_DYNAMIC_CLASS(wxFont)
};
#endif
// Name: fontdlg.h
// Purpose: wxFontDialog class. Use generic version if no
// platform-specific implementation.
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/06/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FONTDLG_H_
#define _WX_FONTDLG_H_
-#ifdef __GNUG__
-#pragma interface "fontdlg.h"
-#endif
-
#include "wx/dialog.h"
#include "wx/cmndata.h"
/*
* Font dialog
*/
-
+
class WXDLLEXPORT wxFontDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxFontDialog)
/////////////////////////////////////////////////////////////////////////////
// Name: frame.h
// Purpose: wxFrame class
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/06/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
#include "wx/window.h"
#include "wx/toolbar.h"
-#include "wx/accel.h"
+#include "wx/os2/accel.h"
#include "wx/icon.h"
-WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr;
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
- wxFrame();
- inline wxFrame(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME_STYLE,
- const wxString& name = wxFrameNameStr)
- {
- Create(parent, id, title, pos, size, style, name);
- }
-
- ~wxFrame();
-
- bool Create(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_FRAME_STYLE,
- const wxString& name = wxFrameNameStr);
-
- virtual bool Destroy();
- void SetClientSize(int width, int height);
- void GetClientSize(int *width, int *height) const;
-
- void GetSize(int *width, int *height) const ;
- void GetPosition(int *x, int *y) const ;
- void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
- void ClientToScreen(int *x, int *y) const;
- void ScreenToClient(int *x, int *y) const;
-
- void OnSize(wxSizeEvent& event);
- void OnMenuHighlight(wxMenuEvent& event);
- void OnActivate(wxActivateEvent& event);
- void OnIdle(wxIdleEvent& event);
- void OnCloseWindow(wxCloseEvent& event);
-
- bool Show(bool show);
-
- // Set menu bar
- void SetMenuBar(wxMenuBar *menu_bar);
- virtual wxMenuBar *GetMenuBar() const ;
-
- // Set title
- void SetTitle(const wxString& title);
- wxString GetTitle() const ;
-
- void Centre(int direction = wxBOTH);
-
- // Call this to simulate a menu command
- virtual void Command(int id);
- virtual void ProcessCommand(int id);
-
- // Set icon
- virtual void SetIcon(const wxIcon& icon);
-
- // Create status line
- virtual wxStatusBar* CreateStatusBar(int number=1, long style = wxST_SIZEGRIP, wxWindowID id = 0,
- const wxString& name = "statusBar");
- inline wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
- virtual void PositionStatusBar();
- virtual wxStatusBar *OnCreateStatusBar(int number, long style, wxWindowID id,
- const wxString& name);
-
- // Create toolbar
- virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1, const wxString& name = wxToolBarNameStr);
- virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
- // If made known to the frame, the frame will manage it automatically.
- virtual inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
- virtual inline wxToolBar *GetToolBar() const { return m_frameToolBar; }
- virtual void PositionToolBar();
-
- // Set status line text
- virtual void SetStatusText(const wxString& text, int number = 0);
-
- // Set status line widths
- virtual void SetStatusWidths(int n, const int widths_field[]);
-
- // Hint to tell framework which status bar to use
- // TODO: should this go into a wxFrameworkSettings class perhaps?
- static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
- static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
-
- // Fit frame around subwindows
- virtual void Fit();
-
- // Iconize
- virtual void Iconize(bool iconize);
-
- virtual bool IsIconized() const ;
-
- // Compatibility
- inline bool Iconized() const { return IsIconized(); }
-
- // Is the frame maximized?
- virtual bool IsMaximized(void) const ;
-
- virtual void Maximize(bool maximize);
-
- // Responds to colour changes
- void OnSysColourChanged(wxSysColourChangedEvent& event);
-
- // Query app for menu item updates (called from OnIdle)
- void DoMenuUpdates();
- void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+ wxFrame();
+ inline wxFrame( wxWindow* parent
+ ,wxWindowID id
+ ,const wxString& title
+ ,const wxPoint& pos = wxDefaultPosition
+ ,const wxSize& size = wxDefaultSize
+ ,long style = wxDEFAULT_FRAME_STYLE
+ ,const wxString& name = wxFrameNameStr
+ )
+ {
+ Create(parent, id, title, pos, size, style, name);
+ }
- // Checks if there is a toolbar, and returns the first free client position
- virtual wxPoint GetClientAreaOrigin() const;
+ ~wxFrame();
+
+ bool Create( wxWindow* parent
+ ,wxWindowID id
+ ,const wxString& title
+ ,const wxPoint& pos = wxDefaultPosition
+ ,const wxSize& size = wxDefaultSize
+ ,long style = wxDEFAULT_FRAME_STYLE
+ ,const wxString& name = wxFrameNameStr
+ );
+
+ virtual bool Destroy();
+
+ virtual void ClientToScreen(int *x, int *y) const;
+ virtual void ScreenToClient(int *x, int *y) const;
+
+ void SetClientSize(int width, int height);
+ void GetClientSize(int *width, int *height) const;
+
+ void OnSize(wxSizeEvent& event);
+ void OnMenuHighlight(wxMenuEvent& event);
+ void OnActivate(wxActivateEvent& event);
+ void OnIdle(wxIdleEvent& event);
+ void OnCloseWindow(wxCloseEvent& event);
+
+ bool Show(bool show);
+
+ void DetachMenuBar();
+
+ // Set menu bar
+ void SetMenuBar(wxMenuBar *menu_bar);
+ virtual wxMenuBar *GetMenuBar() const ;
+
+ // Call this to simulate a menu command
+ inline bool Command(int id) { return ProcessCommand(id); }
+
+ // process menu command: returns TRUE if processed
+ bool ProcessCommand(int id);
+
+ // make the window modal (all other windows unresponsive)
+ virtual void MakeModal(bool modal = TRUE);
+
+ // Set icon
+ virtual void SetIcon(const wxIcon& icon);
+
+ // Toolbar
+#if wxUSE_TOOLBAR
+ virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT,
+ wxWindowID id = -1,
+ const wxString& name = wxToolBarNameStr);
+
+ virtual wxToolBar *OnCreateToolBar(long style, wxWindowID id, const wxString& name);
+
+ virtual void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
+ virtual wxToolBar *GetToolBar() const { return m_frameToolBar; }
+
+ virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+ // Status bar
+ virtual wxStatusBar* CreateStatusBar(int number = 1,
+ long style = wxST_SIZEGRIP,
+ wxWindowID id = 0,
+ const wxString& name = wxStatusLineNameStr);
+
+ wxStatusBar *GetStatusBar() const { return m_frameStatusBar; }
+ void SetStatusBar(wxStatusBar *statusBar) { m_frameStatusBar = statusBar; }
+
+ virtual void PositionStatusBar();
+ virtual wxStatusBar *OnCreateStatusBar(int number,
+ long style,
+ wxWindowID id,
+ const wxString& name);
+
+ // Set status line text
+ virtual void SetStatusText(const wxString& text, int number = 0);
+
+ // Set status line widths
+ virtual void SetStatusWidths(int n, const int widths_field[]);
+
+ // Hint to tell framework which status bar to use
+ // TODO: should this go into a wxFrameworkSettings class perhaps?
+ static void UseNativeStatusBar(bool useNative) { m_useNativeStatusBar = useNative; };
+ static bool UsesNativeStatusBar() { return m_useNativeStatusBar; };
+#endif // wxUSE_STATUSBAR
+
+ // Iconize
+ virtual void Iconize(bool iconize);
+
+ virtual bool IsIconized() const;
+
+ // Is it maximized?
+ virtual bool IsMaximized() const;
+
+ // Compatibility
+ bool Iconized() const { return IsIconized(); }
+
+ virtual void Maximize(bool maximize);
+ // virtual bool LoadAccelerators(const wxString& table);
+
+ // Responds to colour changes
+ void OnSysColourChanged(wxSysColourChangedEvent& event);
+
+ // Query app for menu item updates (called from OnIdle)
+ void DoMenuUpdates();
+ void DoMenuUpdates(wxMenu* menu, wxWindow* focusWin);
+
+ WXHMENU GetWinMenu() const { return m_hMenu; }
+
+ // Returns the origin of client area (may be different from (0,0) if the
+ // frame has a toolbar)
+ virtual wxPoint GetClientAreaOrigin() const;
+
+ // Implementation only from here
+ // event handlers
+ bool HandlePaint();
+ bool HandleSize(int x, int y, WXUINT flag);
+ bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
+ bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
+
+ bool OS2Create(int id, wxWindow *parent, const wxChar *wclass,
+ wxWindow *wx_win, const wxChar *title,
+ int x, int y, int width, int height, long style);
+
+ // tooltip management
+#if wxUSE_TOOLTIPS
+ WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
+ void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
+#endif // tooltips
protected:
- wxMenuBar * m_frameMenuBar;
- wxStatusBar * m_frameStatusBar;
- wxIcon m_icon;
- bool m_iconized;
- static bool m_useNativeStatusBar;
- wxToolBar * m_frameToolBar ;
-
- DECLARE_EVENT_TABLE()
+ // override base class virtuals
+ virtual void DoGetClientSize(int *width, int *height) const;
+ virtual void DoGetSize(int *width, int *height) const;
+ virtual void DoGetPosition(int *x, int *y) const;
+
+ virtual void DoSetClientSize(int width, int height);
+
+ // a plug in for MDI frame classes which need to do something special when
+ // the menubar is set
+ virtual void InternalSetMenuBar();
+
+ // propagate our state change to all child frames
+ void IconizeChildFrames(bool bIconize);
+
+ // we add menu bar accel processing
+ bool OS2TranslateMessage(WXMSG* pMsg);
+
+ // window proc for the frames
+ MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
+ wxMenuBar * m_frameMenuBar;
+ wxIcon m_icon;
+ bool m_iconized;
+ WXHICON m_defaultIcon;
+
+#if wxUSE_STATUSBAR
+ wxStatusBar * m_frameStatusBar;
+
+ static bool m_useNativeStatusBar;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+ wxToolBar * m_frameToolBar;
+#endif // wxUSE_TOOLBAR
+
+private:
+#if wxUSE_TOOLTIPS
+ WXHWND m_hwndToolTip;
+#endif // tooltips
+
+ DECLARE_EVENT_TABLE()
};
#endif
// _WX_FRAME_H_
+
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change this to your WXWIN directory
-WXDIR=h:\dev\Wx2\wxwindows
+WXDIR=j:\dev\Wx2\wxwindows
WXSRC=$(WXDIR)\src\os2
WXINC=$(WXDIR)\include
/////////////////////////////////////////////////////////////////////////////
// Name: font.cpp
// Purpose: wxFont class
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/06/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "font.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/defs.h"
-#include "wx/string.h"
-#include "wx/font.h"
-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+ #include <stdio.h>
+ #include "wx/setup.h"
+ #include "wx/list.h"
+ #include "wx/utils.h"
+ #include "wx/app.h"
+ #include "wx/font.h"
+#endif // WX_PRECOMP
+
+#include "wx/os2/private.h"
#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+ IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
+
+ #if wxUSE_PORTABLE_FONTS_IN_MSW
+ IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
+ #endif
#endif
-wxFontRefData::wxFontRefData()
+// ----------------------------------------------------------------------------
+// wxFontRefData - the internal description of the font
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFontRefData: public wxGDIRefData
{
- m_style = 0;
- m_pointSize = 0;
- m_family = 0;
- m_style = 0;
- m_weight = 0;
- m_underlined = 0;
- m_faceName = "";
-/* TODO
- m_hFont = 0;
-*/
-}
+friend class WXDLLEXPORT wxFont;
+
+public:
+ wxFontRefData()
+ {
+ Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
+ "", wxFONTENCODING_DEFAULT);
+ }
+
+ wxFontRefData(const wxFontRefData& data)
+ {
+ Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
+ data.m_underlined, data.m_faceName, data.m_encoding);
+
+ m_fontId = data.m_fontId;
+ }
+
+ wxFontRefData(int size,
+ int family,
+ int style,
+ int weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
+ {
+ Init(size, family, style, weight, underlined, faceName, encoding);
+ }
-wxFontRefData::wxFontRefData(const wxFontRefData& data)
+ virtual ~wxFontRefData();
+
+protected:
+ // common part of all ctors
+ void Init(int size,
+ int family,
+ int style,
+ int weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding);
+
+ // If TRUE, the pointer to the actual font is temporary and SHOULD NOT BE
+ // DELETED by destructor
+ bool m_temporary;
+
+ int m_fontId;
+
+ // font characterstics
+ int m_pointSize;
+ int m_family;
+ int m_style;
+ int m_weight;
+ bool m_underlined;
+ wxString m_faceName;
+ wxFontEncoding m_encoding;
+
+ // Windows font handle
+ WXHFONT m_hFont;
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxFontRefData
+// ----------------------------------------------------------------------------
+
+void wxFontRefData::Init(int pointSize,
+ int family,
+ int style,
+ int weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
{
- m_style = data.m_style;
- m_pointSize = data.m_pointSize;
- m_family = data.m_family;
- m_style = data.m_style;
- m_weight = data.m_weight;
- m_underlined = data.m_underlined;
- m_faceName = data.m_faceName;
-/* TODO
- m_hFont = 0;
-*/
+ m_style = style;
+ m_pointSize = pointSize;
+ m_family = family;
+ m_style = style;
+ m_weight = weight;
+ m_underlined = underlined;
+ m_faceName = faceName;
+ m_encoding = encoding;
+
+ m_fontId = 0;
+ m_temporary = FALSE;
+
+ m_hFont = 0;
}
wxFontRefData::~wxFontRefData()
{
- // TODO: delete font data
+// TODO:
+// if ( m_hFont )
+// {
+// if ( !::DeleteObject((HFONT) m_hFont) )
+// {
+// wxLogLastError("DeleteObject(font)");
+// }
+// }
}
-wxFont::wxFont()
-{
- if ( wxTheFontList )
- wxTheFontList->Append(this);
-}
+// ----------------------------------------------------------------------------
+// wxFont
+// ----------------------------------------------------------------------------
-wxFont::wxFont(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
+void wxFont::Init()
{
- Create(pointSize, family, style, weight, underlined, faceName);
-
if ( wxTheFontList )
wxTheFontList->Append(this);
}
-bool wxFont::Create(int pointSize, int family, int style, int weight, bool underlined, const wxString& faceName)
+/* Constructor for a font. Note that the real construction is done
+ * in wxDC::SetFont, when information is available about scaling etc.
+ */
+bool wxFont::Create(int pointSize,
+ int family,
+ int style,
+ int weight,
+ bool underlined,
+ const wxString& faceName,
+ wxFontEncoding encoding)
{
UnRef();
- m_refData = new wxFontRefData;
-
- M_FONTDATA->m_family = family;
- M_FONTDATA->m_style = style;
- M_FONTDATA->m_weight = weight;
- M_FONTDATA->m_pointSize = pointSize;
- M_FONTDATA->m_underlined = underlined;
- M_FONTDATA->m_faceName = faceName;
+ m_refData = new wxFontRefData(pointSize, family, style, weight,
+ underlined, faceName, encoding);
RealizeResource();
wxFont::~wxFont()
{
- if (wxTheFontList)
+ if ( wxTheFontList )
wxTheFontList->DeleteObject(this);
}
+// ----------------------------------------------------------------------------
+// real implementation
+// ----------------------------------------------------------------------------
+
bool wxFont::RealizeResource()
{
- // TODO: create the font (if there is a native font object)
+ if ( GetResourceHandle() )
+ {
+ // VZ: the old code returned FALSE in this case, but it doesn't seem
+ // to make sense because the font _was_ created
+ wxLogDebug(T("Calling wxFont::RealizeResource() twice"));
+
+ return TRUE;
+ }
+
+ int ff_family = 0;
+ wxString ff_face;
+
+// OS/2 combines the family with styles to give a facename
+
+ switch ( M_FONTDATA->m_family )
+ {
+ case wxSCRIPT:
+// ff_family = FF_SCRIPT ;
+ ff_face = T("Script") ;
+ break ;
+
+ case wxDECORATIVE:
+// ff_family = FF_DECORATIVE;
+ break;
+
+ case wxROMAN:
+// ff_family = FF_ROMAN;
+ ff_face = T("Times New Roman") ;
+ break;
+
+ case wxTELETYPE:
+ case wxMODERN:
+// ff_family = FF_MODERN;
+ ff_face = T("Courier New") ;
+ break;
+
+ case wxSWISS:
+// ff_family = FF_SWISS;
+ ff_face = T("Arial") ;
+ break;
+
+ case wxDEFAULT:
+ default:
+// ff_family = FF_SWISS;
+ ff_face = T("Arial") ;
+ }
+
+ BYTE ff_italic;
+ switch ( M_FONTDATA->m_style )
+ {
+ case wxITALIC:
+ case wxSLANT:
+ ff_italic = 1;
+ break;
+
+ default:
+ wxFAIL_MSG(T("unknown font slant"));
+ // fall through
+
+ case wxNORMAL:
+ ff_italic = 0;
+ }
+
+ int ff_weight = 0;
+ switch ( M_FONTDATA->m_weight )
+ {
+ default:
+ wxFAIL_MSG(T("unknown font weight"));
+ // fall through
+
+ case wxNORMAL:
+// ff_weight = FW_NORMAL;
+ break;
+
+ case wxLIGHT:
+// ff_weight = FW_LIGHT;
+ break;
+
+ case wxBOLD:
+// ff_weight = FW_BOLD;
+ break;
+ }
+
+ const wxChar* pzFace;
+ if ( M_FONTDATA->m_faceName.IsEmpty() )
+ pzFace = ff_face;
+ else
+ pzFace = M_FONTDATA->m_faceName ;
+
+#if 0
+ /* Always calculate fonts using the screen DC (is this the best strategy?)
+ * There may be confusion if a font is selected into a printer
+ * DC (say), because the height will be calculated very differently.
+ */
+ // What sort of display is it?
+ int technology = ::GetDeviceCaps(dc, TECHNOLOGY);
+
+ int nHeight;
+
+ if (technology != DT_RASDISPLAY && technology != DT_RASPRINTER)
+ {
+ // Have to get screen DC Caps, because a metafile will return 0.
+ HDC dc2 = ::GetDC(NULL);
+ nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc2, LOGPIXELSY)/72;
+ ::ReleaseDC(NULL, dc2);
+ }
+ else
+ {
+ nHeight = M_FONTDATA->m_pointSize*GetDeviceCaps(dc, LOGPIXELSY)/72;
+ }
+#endif // 0
+
+#if 0
+ // Have to get screen DC Caps, because a metafile will return 0.
+ HDC dc2 = ::GetDC(NULL);
+ ppInch = ::GetDeviceCaps(dc2, LOGPIXELSY);
+ ::ReleaseDC(NULL, dc2);
+#endif // 0
+
+ // New behaviour: apparently ppInch varies according to Large/Small Fonts
+ // setting in Windows. This messes up fonts. So, set ppInch to a constant
+ // 96 dpi.
+ static const int ppInch = 96;
+
+#if wxFONT_SIZE_COMPATIBILITY
+ // Incorrect, but compatible with old wxWindows behaviour
+ int nHeight = (M_FONTDATA->m_pointSize*ppInch/72);
+#else
+ // Correct for Windows compatibility
+ int nHeight = - (M_FONTDATA->m_pointSize*ppInch/72);
+#endif
+
+ BYTE ff_underline = M_FONTDATA->m_underlined;
+
+ wxFontEncoding encoding = M_FONTDATA->m_encoding;
+ if ( encoding == wxFONTENCODING_DEFAULT )
+ {
+ encoding = wxFont::GetDefaultEncoding();
+ }
+
+ DWORD charset;
+ switch ( encoding )
+ {
+ case wxFONTENCODING_ISO8859_1:
+ case wxFONTENCODING_ISO8859_15:
+ case wxFONTENCODING_CP1250:
+// charset = ANSI_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_2:
+ case wxFONTENCODING_CP1252:
+// charset = EASTEUROPE_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_4:
+ case wxFONTENCODING_ISO8859_10:
+// charset = BALTIC_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_5:
+ case wxFONTENCODING_CP1251:
+// charset = RUSSIAN_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_6:
+// charset = ARABIC_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_7:
+// charset = GREEK_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_8:
+// charset = HEBREW_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_9:
+// charset = TURKISH_CHARSET;
+ break;
+
+ case wxFONTENCODING_ISO8859_11:
+// charset = THAI_CHARSET;
+ break;
+
+ case wxFONTENCODING_CP437:
+// charset = OEM_CHARSET;
+ break;
+
+ default:
+ wxFAIL_MSG(T("unsupported encoding"));
+ // fall through
+
+ case wxFONTENCODING_SYSTEM:
+// charset = ANSI_CHARSET;
+ break;
+ }
+
+// TODO:
+WXHFONT hFont;
+// HFONT hFont = ::CreateFont
+// (
+// nHeight, // height
+// 0, // width (choose best)
+// 0, // escapement
+// 0, // orientation
+// ff_weight, // weight
+// ff_italic, // italic?
+// ff_underline, // underlined?
+// 0, // strikeout?
+// charset, // charset
+// OUT_DEFAULT_PRECIS, // precision
+// CLIP_DEFAULT_PRECIS, // clip precision
+// PROOF_QUALITY, // quality of match
+// DEFAULT_PITCH | // fixed or variable
+// ff_family, // family id
+// pzFace // face name
+// );
+
+ M_FONTDATA->m_hFont = (WXHFONT)hFont;
+ if ( !hFont )
+ {
+ wxLogLastError("CreateFont");
+ }
+
+ return hFont != 0;
+}
+
+bool wxFont::FreeResource(bool force)
+{
+ if ( GetResourceHandle() )
+ {
+// TODO:
+// if ( !::DeleteObject((HFONT) M_FONTDATA->m_hFont) )
+// {
+// wxLogLastError("DeleteObject(font)");
+// }
+
+ M_FONTDATA->m_hFont = 0;
+
+ return TRUE;
+ }
return FALSE;
}
+WXHANDLE wxFont::GetResourceHandle()
+{
+ if ( !M_FONTDATA )
+ return 0;
+ else
+ return (WXHANDLE)M_FONTDATA->m_hFont ;
+}
+
+bool wxFont::IsFree() const
+{
+ return (M_FONTDATA && (M_FONTDATA->m_hFont == 0));
+}
+
void wxFont::Unshare()
{
- // Don't change shared data
- if (!m_refData)
+ // Don't change shared data
+ if ( !m_refData )
{
- m_refData = new wxFontRefData();
- }
+ m_refData = new wxFontRefData();
+ }
else
{
- wxFontRefData* ref = new wxFontRefData(*(wxFontRefData*)m_refData);
- UnRef();
- m_refData = ref;
- }
+ wxFontRefData* ref = new wxFontRefData(*M_FONTDATA);
+ UnRef();
+ m_refData = ref;
+ }
}
+// ----------------------------------------------------------------------------
+// change font attribute: we recreate font when doing it
+// ----------------------------------------------------------------------------
+
void wxFont::SetPointSize(int pointSize)
{
Unshare();
RealizeResource();
}
-wxString wxFont::GetFamilyString() const
-{
- wxString fam("");
- switch (GetFamily())
- {
- case wxDECORATIVE:
- fam = "wxDECORATIVE";
- break;
- case wxROMAN:
- fam = "wxROMAN";
- break;
- case wxSCRIPT:
- fam = "wxSCRIPT";
- break;
- case wxSWISS:
- fam = "wxSWISS";
- break;
- case wxMODERN:
- fam = "wxMODERN";
- break;
- case wxTELETYPE:
- fam = "wxTELETYPE";
- break;
- default:
- fam = "wxDEFAULT";
- break;
- }
- return fam;
-}
-
-/* New font system */
-wxString wxFont::GetFaceName() const
+void wxFont::SetEncoding(wxFontEncoding encoding)
{
- wxString str("");
- if (M_FONTDATA)
- str = M_FONTDATA->m_faceName ;
- return str;
+ Unshare();
+
+ M_FONTDATA->m_encoding = encoding;
+
+ RealizeResource();
}
-wxString wxFont::GetStyleString() const
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+int wxFont::GetPointSize() const
{
- wxString styl("");
- switch (GetStyle())
- {
- case wxITALIC:
- styl = "wxITALIC";
- break;
- case wxSLANT:
- styl = "wxSLANT";
- break;
- default:
- styl = "wxNORMAL";
- break;
- }
- return styl;
+ return M_FONTDATA->m_pointSize;
}
-wxString wxFont::GetWeightString() const
+int wxFont::GetFamily() const
{
- wxString w("");
- switch (GetWeight())
- {
- case wxBOLD:
- w = "wxBOLD";
- break;
- case wxLIGHT:
- w = "wxLIGHT";
- break;
- default:
- w = "wxNORMAL";
- break;
- }
- return w;
+ return M_FONTDATA->m_family;
+}
+
+int wxFont::GetFontId() const
+{
+ return M_FONTDATA->m_fontId;
+}
+
+int wxFont::GetStyle() const
+{
+ return M_FONTDATA->m_style;
+}
+
+int wxFont::GetWeight() const
+{
+ return M_FONTDATA->m_weight;
+}
+
+bool wxFont::GetUnderlined() const
+{
+ return M_FONTDATA->m_underlined;
+}
+
+wxString wxFont::GetFaceName() const
+{
+ wxString str;
+ if ( M_FONTDATA )
+ str = M_FONTDATA->m_faceName ;
+ return str;
+}
+
+wxFontEncoding wxFont::GetEncoding() const
+{
+ return M_FONTDATA->m_encoding;
}
// Name: fontdlg.cpp
// Purpose: wxFontDialog class. NOTE: you can use the generic class
// if you wish, instead of implementing this.
-// Author: AUTHOR
+// Author: David Webster
// Modified by:
-// Created: ??/??/98
+// Created: 10/06/99
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) David Webster
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "fontdlg.h"
+// 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"
#endif
-#include "wx/stubs/fontdlg.h"
+#include "wx/fontdlg.h"
+
+#define INCL_PM
+#include <os2.h>
+
+#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_DYNAMIC_CLASS(wxFontDialog, wxDialog)
#endif
/*
* wxFontDialog
*/
-
wxFontDialog::wxFontDialog()
{
m_dialogParent = NULL;
if (data)
m_fontData = *data;
-
- // TODO: you may need to do dialog creation here, unless it's
- // done in ShowModal.
return TRUE;
}
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
-
-#include "wx/frame.h"
-#include "wx/event.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/setup.h"
+ #include "wx/frame.h"
+ #include "wx/menu.h"
+ #include "wx/app.h"
+ #include "wx/utils.h"
+ #include "wx/dialog.h"
+ #include "wx/settings.h"
+ #include "wx/dcclient.h"
+#endif // WX_PRECOMP
+
+#include "wx/os2/private.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
#include "wx/menuitem.h"
-#include "wx/menu.h"
-#include "wx/dcclient.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/app.h"
+#include "wx/log.h"
-extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
+extern wxWindowList wxModelessWindows;
+extern wxList WXDLLEXPORT wxPendingDelete;
+extern wxChar wxFrameClassName[];
+extern wxMenu *wxCurrentPopupMenu;
#if !USE_SHARED_LIBRARY
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#endif
-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
wxFrame::wxFrame()
{
+ m_frameToolBar = NULL ;
m_frameMenuBar = NULL;
m_frameStatusBar = NULL;
m_iconized = FALSE;
-
- m_frameToolBar = NULL ;
}
-bool wxFrame::Create(wxWindow *parent,
- wxWindowID id,
- const wxString& title,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
+bool wxFrame::Create( wxWindow *parent
+ ,wxWindowID id
+ ,const wxString& title
+ ,const wxPoint& pos
+ ,const wxSize& size
+ ,long style
+ ,const wxString& name
+ )
{
- if (!parent)
- wxTopLevelWindows.Append(this);
+#if wxUSE_TOOLTIPS
+ m_hwndToolTip = 0;
+#endif
SetName(name);
m_windowStyle = style;
SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+// m_icon = NULL;
if ( id > -1 )
m_windowId = id;
else
if (parent) parent->AddChild(this);
- wxModelessWindows.Append(this);
+ int x = pos.x;
+ int y = pos.y;
+ int width = size.x;
+ int height = size.y;
- // TODO: create frame.
+ m_iconized = FALSE;
+
+ if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
+ parent = NULL;
- return FALSE;
+ if (!parent)
+ wxTopLevelWindows.Append(this);
+
+ OS2Create(m_windowId, parent, wxFrameClassName, this, title,
+ x, y, width, height, style);
+
+ wxModelessWindows.Append(this);
+ return TRUE;
}
wxFrame::~wxFrame()
{
+ m_isBeingDeleted = TRUE;
wxTopLevelWindows.DeleteObject(this);
if (m_frameStatusBar)
if (m_frameMenuBar)
delete m_frameMenuBar;
-/* Check if it's the last top-level window */
-
if (wxTheApp && (wxTopLevelWindows.Number() == 0))
{
wxTheApp->SetTopWindow(NULL);
if (wxTheApp->GetExitOnFrameDelete())
{
- // TODO signal to the app that we're going to close
+// TODO: PostQuitMessage(0);
+ return;
}
}
wxModelessWindows.DeleteObject(this);
+
+ // For some reason, wxWindows can activate another task altogether
+ // when a frame is destroyed after a modal dialog has been invoked.
+ // Try to bring the parent to the top.
+ // MT:Only do this if this frame is currently the active window, else weird
+ // things start to happen
+ if ( wxGetActiveWindow() == this )
+ if (GetParent() && GetParent()->GetHWND())
+ // TODO: OS/2 PM version
+ // ::BringWindowToTop((HWND) GetParent()->GetHWND());
+return;
}
// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::GetClientSize(int *x, int *y) const
+void wxFrame::DoGetClientSize(int *x, int *y) const
{
- // TODO
+ RECT rect;
+//TODO: ::GetClientRect(GetHwnd(), &rect);
+
+ if ( GetStatusBar() )
+ {
+ int statusX, statusY;
+ GetStatusBar()->GetClientSize(&statusX, &statusY);
+// TODO: OS/2's rect rect.bottom -= statusY;
+ }
+
+ wxPoint pt(GetClientAreaOrigin());
+/*
+ rect.bottom -= pt.y;
+ rect.right -= pt.x;
+
+ if ( x )
+ *x = rect.right;
+ if ( y )
+ *y = rect.bottom;
+*/
}
// Set the client size (i.e. leave the calculation of borders etc.
// to wxWindows)
-void wxFrame::SetClientSize(int width, int height)
+void wxFrame::DoSetClientSize(int width, int height)
{
- // TODO
-}
+ HWND hWnd = GetHwnd();
-void wxFrame::GetSize(int *width, int *height) const
-{
- // TODO
+ RECT rect;
+// TODO: ::GetClientRect(hWnd, &rect);
+
+ RECT rect2;
+//TODO: ::GetWindowRect(hWnd, &rect2);
+
+ // Find the difference between the entire window (title bar and all)
+ // and the client area; add this to the new client size to move the
+ // window
+/*
+ int actual_width = rect2.right - rect2.left - rect.right + width;
+ int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
+*/
+ if ( GetStatusBar() )
+ {
+ int statusX, statusY;
+ GetStatusBar()->GetClientSize(&statusX, &statusY);
+// actual_height += statusY;
+ }
+/*
+ wxPoint pt(GetClientAreaOrigin());
+ actual_width += pt.y;
+ actual_height += pt.x;
+
+ POINT point;
+
+ point.x = rect2.left;
+ point.y = rect2.top;
+
+ MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
+*/
+ wxSizeEvent event(wxSize(width, height), m_windowId);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
}
-void wxFrame::GetPosition(int *x, int *y) const
+void wxFrame::DoGetSize(int *width, int *height) const
{
- // TODO
+ RECT rect;
+// TODO: ::GetWindowRect(GetHwnd(), &rect);
+// *width = rect.right - rect.left;
+// *height = rect.bottom - rect.top;
}
-void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxFrame::DoGetPosition(int *x, int *y) const
{
- // TODO
+ RECT rect;
+// TODO: ::GetWindowRect(GetHwnd(), &rect);
+ POINTL point;
+// point.x = rect.left;
+// point.y = rect.top;
+
+ *x = point.x;
+ *y = point.y;
}
bool wxFrame::Show(bool show)
{
- // TODO
- return FALSE;
+ int cshow;
+/*
+ if (show)
+ cshow = SW_SHOW;
+ else
+ cshow = SW_HIDE;
+*/
+ if (!show)
+ {
+ // Try to highlight the correct window (the parent)
+ HWND hWndParent = 0;
+ if (GetParent())
+ {
+ hWndParent = (HWND) GetParent()->GetHWND();
+ if (hWndParent)
+// TODO: ::BringWindowToTop(hWndParent);
+ cshow = (int)show; // just to have something here, remove
+ }
+ }
+
+// TODO: ::ShowWindow(GetHwnd(), (BOOL)cshow);
+ if (show)
+ {
+// TODO: ::BringWindowToTop(GetHwnd());
+
+ wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
+ event.SetEventObject( this );
+ GetEventHandler()->ProcessEvent(event);
+ }
+ return TRUE;
}
void wxFrame::Iconize(bool iconize)
{
- // TODO
+ if (!iconize)
+ Show(TRUE);
+
+ int cshow;
+/*
+ if (iconize)
+ cshow = SW_MINIMIZE;
+ else
+ cshow = SW_RESTORE;
+ ShowWindow(GetHwnd(), (BOOL)cshow);
+*/
+ m_iconized = iconize;
}
// Equivalent to maximize/restore in Windows
void wxFrame::Maximize(bool maximize)
{
- // TODO
+ Show(TRUE);
+ int cshow;
+/*
+ if (maximize)
+ cshow = SW_MAXIMIZE;
+ else
+ cshow = SW_RESTORE;
+ ShowWindow(GetHwnd(), cshow);
+*/
+ m_iconized = FALSE;
}
bool wxFrame::IsIconized() const
{
- // TODO
- return FALSE;
-}
-
-// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
-{
- // TODO
- return FALSE;
-}
-
-void wxFrame::SetTitle(const wxString& title)
-{
- // TODO
+// TODO: ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
+ return m_iconized;
}
-wxString wxFrame::GetTitle() const
+// Is it maximized?
+bool wxFrame::IsMaximized() const
{
- // TODO
- return wxString("");
+//TODO: return (::IsZoomed(GetHwnd()) != 0) ;
+ return FALSE; // remove
}
void wxFrame::SetIcon(const wxIcon& icon)
{
m_icon = icon;
- // TODO
}
+#if wxUSE_STATUSBAR
wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
const wxString& name)
{
wxStatusBar *statusBar = NULL;
statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
- style, name);
+ style, name);
// Set the height according to the font and the border size
wxClientDC dc(statusBar);
dc.SetFont(statusBar->GetFont());
long x, y;
- dc.GetTextExtent("X", &x, &y, NULL, NULL, NULL);
+ dc.GetTextExtent("X", &x, &y);
int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY());
-
statusBar->SetSize(-1, -1, 100, height);
-
statusBar->SetFieldsCount(number);
return statusBar;
}
wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
const wxString& name)
{
- // Calling CreateStatusBar twice is an error.
+ // VZ: calling CreateStatusBar twice is an error - why anyone would do it?
wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
- "recreating status bar in wxFrame" );
+ T("recreating status bar in wxFrame") );
m_frameStatusBar = OnCreateStatusBar(number, style, id,
name);
void wxFrame::SetStatusText(const wxString& text, int number)
{
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+ wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set text for") );
m_frameStatusBar->SetStatusText(text, number);
}
void wxFrame::SetStatusWidths(int n, const int widths_field[])
{
- wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+ wxCHECK_RET( m_frameStatusBar != NULL, T("no statusbar to set widths for") );
m_frameStatusBar->SetStatusWidths(n, widths_field);
PositionStatusBar();
void wxFrame::PositionStatusBar()
{
- int w, h;
- GetClientSize(&w, &h);
- int sw, sh;
- m_frameStatusBar->GetSize(&sw, &sh);
-
- // Since we wish the status bar to be directly under the client area,
- // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
- m_frameStatusBar->SetSize(0, h, w, sh);
+ // native status bar positions itself
+ if (m_frameStatusBar)
+ {
+ int w, h;
+ GetClientSize(&w, &h);
+ int sw, sh;
+ m_frameStatusBar->GetSize(&sw, &sh);
+
+ // Since we wish the status bar to be directly under the client area,
+ // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
+ m_frameStatusBar->SetSize(0, h, w, sh);
+ }
}
+#endif // wxUSE_STATUSBAR
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
+void wxFrame::DetachMenuBar()
{
- if (!menuBar)
+ if (m_frameMenuBar)
{
+// Fix this in wxMenuBar m_frameMenuBar->Detach();
m_frameMenuBar = NULL;
+ }
+}
+
+void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
+{
+ if (!menu_bar)
+ {
+ DetachMenuBar();
return;
}
- m_frameMenuBar = menuBar;
+// Fix this in wxMenuBar wxCHECK_RET( !menu_bar->GetFrame(), T("this menubar is already attached") );
- // TODO
+ if (m_frameMenuBar)
+ delete m_frameMenuBar;
+
+// Fix this in wxMenuBar m_hMenu = menu_bar->Create();
+
+ if ( !m_hMenu )
+ return;
+
+ InternalSetMenuBar();
+
+ m_frameMenuBar = menu_bar;
+// Fix this in wxMenuBar menu_bar->Attach(this);
}
-void wxFrame::Fit()
+void wxFrame::InternalSetMenuBar()
{
- // Work out max. size
- wxNode *node = GetChildren().First();
- int max_width = 0;
- int max_height = 0;
- while (node)
- {
- // Find a child that's a subwindow, but not a dialog box.
- wxWindow *win = (wxWindow *)node->Data();
-
- if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
- !win->IsKindOf(CLASSINFO(wxDialog)))
+// TODO:
+/* if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
{
- int width, height;
- int x, y;
- win->GetSize(&width, &height);
- win->GetPosition(&x, &y);
-
- if ((x + width) > max_width)
- max_width = x + width;
- if ((y + height) > max_height)
- max_height = y + height;
+ wxLogLastError("SetMenu");
}
- node = node->Next();
- }
- SetClientSize(max_width, max_height);
+*/
}
// Responds to colour changes, and passes event on to children.
{
wxSysColourChangedEvent event2;
event2.SetEventObject( m_frameStatusBar );
- m_frameStatusBar->ProcessEvent(event2);
+ m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
}
// Propagate the event to the non-top-level children
wxWindow::OnSysColourChanged(event);
}
-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
+/*
+ * Frame window
+ *
+ */
+
+bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
+ int x, int y, int width, int height, long style)
+
+{
+ m_defaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
+
+ // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
+ // could be the culprit. But without it, you can get a lot of flicker.
+// TODO:
+/*
+ DWORD msflags = 0;
+ if ((style & wxCAPTION) == wxCAPTION)
+ msflags = WS_OVERLAPPED;
+ else
+ msflags = WS_POPUP;
+
+ if (style & wxMINIMIZE_BOX)
+ msflags |= WS_MINIMIZEBOX;
+ if (style & wxMAXIMIZE_BOX)
+ msflags |= WS_MAXIMIZEBOX;
+ if (style & wxTHICK_FRAME)
+ msflags |= WS_THICKFRAME;
+ if (style & wxSYSTEM_MENU)
+ msflags |= WS_SYSMENU;
+ if ((style & wxMINIMIZE) || (style & wxICONIZE))
+ msflags |= WS_MINIMIZE;
+ if (style & wxMAXIMIZE)
+ msflags |= WS_MAXIMIZE;
+ if (style & wxCAPTION)
+ msflags |= WS_CAPTION;
+ if (style & wxCLIP_CHILDREN)
+ msflags |= WS_CLIPCHILDREN;
+
+ // Keep this in wxFrame because it saves recoding this function
+ // in wxTinyFrame
+#if wxUSE_ITSY_BITSY
+ if (style & wxTINY_CAPTION_VERT)
+ msflags |= IBS_VERTCAPTION;
+ if (style & wxTINY_CAPTION_HORIZ)
+ msflags |= IBS_HORZCAPTION;
+#else
+ if (style & wxTINY_CAPTION_VERT)
+ msflags |= WS_CAPTION;
+ if (style & wxTINY_CAPTION_HORIZ)
+ msflags |= WS_CAPTION;
+#endif
+ if ((style & wxTHICK_FRAME) == 0)
+ msflags |= WS_BORDER;
+
+ WXDWORD extendedStyle = MakeExtendedStyle(style);
+
+#if !defined(__WIN16__) && !defined(__SC__)
+ if (style & wxFRAME_TOOL_WINDOW)
+ extendedStyle |= WS_EX_TOOLWINDOW;
+#endif
+
+ if (style & wxSTAY_ON_TOP)
+ extendedStyle |= WS_EX_TOPMOST;
+
+ m_iconized = FALSE;
+ if ( !wxWindow::OS2Create(id, parent, wclass, wx_win, title, x, y, width, height,
+ msflags, NULL, extendedStyle) )
+ return FALSE;
+
+ // Seems to be necessary if we use WS_POPUP
+ // style instead of WS_OVERLAPPED
+ if (width > -1 && height > -1)
+ ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
+*/
+ return TRUE;
+}
+
+// Default resizing behaviour - if only ONE subwindow, resize to client
+// rectangle size
void wxFrame::OnSize(wxSizeEvent& event)
{
- // if we're using constraints - do use them
- #if wxUSE_CONSTRAINTS
- if ( GetAutoLayout() ) {
- Layout();
- return;
+ // if we're using constraints - do use them
+#if wxUSE_CONSTRAINTS
+ if ( GetAutoLayout() )
+ {
+ Layout();
+ return;
}
- #endif
+#endif
- // do we have _exactly_ one child?
- wxWindow *child = NULL;
- for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
- {
- wxWindow *win = (wxWindow *)node->Data();
- if ( !win->IsKindOf(CLASSINFO(wxFrame)) &&
- !win->IsKindOf(CLASSINFO(wxDialog)) &&
- (win != GetStatusBar()) &&
- (win != GetToolBar()) )
+ // do we have _exactly_ one child?
+ wxWindow *child = NULL;
+ for ( wxWindowList::Node *node = GetChildren().GetFirst();
+ node;
+ node = node->GetNext() )
{
- if ( child )
- return; // it's our second subwindow - nothing to do
- child = win;
+ wxWindow *win = node->GetData();
+ if ( !win->IsTopLevel()
+#if wxUSE_STATUSBAR
+ && (win != GetStatusBar())
+#endif // wxUSE_STATUSBAR
+#if wxUSE_TOOLBAR
+ && (win != GetToolBar())
+#endif // wxUSE_TOOLBAR
+ )
+ {
+ if ( child )
+ return; // it's our second subwindow - nothing to do
+ child = win;
+ }
}
- }
- if ( child ) {
- // we have exactly one child - set it's size to fill the whole frame
- int clientW, clientH;
- GetClientSize(&clientW, &clientH);
+ if ( child ) {
+ // we have exactly one child - set it's size to fill the whole frame
+ int clientW, clientH;
+ GetClientSize(&clientW, &clientH);
- int x = 0;
- int y = 0;
+ int x = 0;
+ int y = 0;
- child->SetSize(x, y, clientW, clientH);
- }
+ child->SetSize(x, y, clientW, clientH);
+ }
}
// Default activation behaviour - set the focus for the first child
// subwindow found.
void wxFrame::OnActivate(wxActivateEvent& event)
{
- for(wxNode *node = GetChildren().First(); node; node = node->Next())
- {
- // Find a child that's a subwindow, but not a dialog box.
- wxWindow *child = (wxWindow *)node->Data();
- if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
- !child->IsKindOf(CLASSINFO(wxDialog)))
+ for ( wxWindowList::Node *node = GetChildren().GetFirst();
+ node;
+ node = node->GetNext() )
{
- child->SetFocus();
- return;
+ // FIXME all this is totally bogus - we need to do the same as wxPanel,
+ // but how to do it without duplicating the code?
+
+ // restore focus
+ wxWindow *child = node->GetData();
+
+ if ( !child->IsTopLevel()
+#if wxUSE_TOOLBAR
+ && !wxDynamicCast(child, wxToolBar)
+#endif // wxUSE_TOOLBAR
+#if wxUSE_STATUSBAR
+ && !wxDynamicCast(child, wxStatusBar)
+#endif // wxUSE_STATUSBAR
+ )
+ {
+ child->SetFocus();
+ return;
+ }
}
- }
}
// The default implementation for the close window event.
-
void wxFrame::OnCloseWindow(wxCloseEvent& event)
{
- this->Destroy();
+ Destroy();
}
// Destroy the window (delayed, if a managed window)
{
if (GetStatusBar())
{
- if (event.GetMenuId() == -1)
- SetStatusText("");
- else
+ wxString help;
+ int menuId = event.GetMenuId();
+ if ( menuId != -1 )
{
wxMenuBar *menuBar = GetMenuBar();
- if (menuBar)
+// Fix this in wxMenuBar
+/*
+ if (menuBar && menuBar->FindItem(menuId))
{
- wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
- if (helpString != "")
- SetStatusText(helpString);
+ help = menuBar->GetHelpString(menuId);
}
+*/
}
+
+ // set status text even if the string is empty - this will at
+ // least remove the string from the item which was previously
+ // selected
+ SetStatusText(help);
}
}
return m_frameMenuBar;
}
-void wxFrame::Centre(int direction)
+bool wxFrame::ProcessCommand(int id)
{
- int display_width, display_height, width, height, x, y;
- wxDisplaySize(&display_width, &display_height);
-
- GetSize(&width, &height);
- GetPosition(&x, &y);
+ wxMenuBar *bar = GetMenuBar() ;
+ if ( !bar )
+ return FALSE;
- if (direction & wxHORIZONTAL)
- x = (int)((display_width - width)/2);
- if (direction & wxVERTICAL)
- y = (int)((display_height - height)/2);
+ wxMenuItem *item = bar->FindItemForId(id);
- SetSize(x, y, width, height);
-}
-
-// Call this to simulate a menu command
-void wxFrame::Command(int id)
-{
- ProcessCommand(id);
-}
-
-void wxFrame::ProcessCommand(int id)
-{
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
- commandEvent.SetInt( id );
- commandEvent.SetEventObject( this );
+ if ( item && item->IsCheckable() )
+ {
+ bar->Check(id, !bar->IsChecked(id)) ;
+ }
- wxMenuBar *bar = GetMenuBar() ;
- if (!bar)
- return;
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+ commandEvent.SetInt( id );
+ commandEvent.SetEventObject( this );
-/* TODO: check the menu item if required
- wxMenuItem *item = bar->FindItemForId(id) ;
- if (item && item->IsCheckable())
- {
- bar->Check(id,!bar->Checked(id)) ;
- }
-*/
-
- wxEvtHandler* evtHandler = GetEventHandler();
- evtHandler->ProcessEvent(commandEvent);
+ return GetEventHandler()->ProcessEvent(commandEvent);
}
// Checks if there is a toolbar, and returns the first free client position
wxWindow::ClientToScreen(x, y);
}
+#if wxUSE_TOOLBAR
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
- "recreating toolbar in wxFrame" );
+ T("recreating toolbar in wxFrame") );
wxToolBar* toolBar = OnCreateToolBar(style, id, name);
if (toolBar)
void wxFrame::PositionToolBar()
{
- int cw, ch;
-
- // TODO: we actually need to use the low-level client size, before
- // the toolbar/status bar were added.
- // So DEFINITELY replace the line below with something appropriate.
-
- GetClientSize(& cw, &ch);
+ RECT rect;
+// TODO: ::GetClientRect(GetHwnd(), &rect);
if ( GetStatusBar() )
{
int statusX, statusY;
GetStatusBar()->GetClientSize(&statusX, &statusY);
- ch -= statusY;
+// TODO: rect.bottom -= statusY;
}
if (GetToolBar())
if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
{
- // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
- // means, pretend we don't have toolbar/status bar, so we
- // have the original client size.
- GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS);
+ // Use the 'real' MSW position
+ GetToolBar()->SetSize(0, 0, tw, rect.yBottom, wxSIZE_NO_ADJUSTMENTS);
}
else
{
- // Use the 'real' position
- GetToolBar()->SetSize(0, 0, cw, th, wxSIZE_NO_ADJUSTMENTS);
+ // Use the 'real' MSW position
+ GetToolBar()->SetSize(0, 0, rect.xRight, th, wxSIZE_NO_ADJUSTMENTS);
+ }
+ }
+}
+#endif // wxUSE_TOOLBAR
+
+// propagate our state change to all child frames: this allows us to emulate X
+// Windows behaviour where child frames float independently of the parent one
+// on the desktop, but are iconized/restored with it
+void wxFrame::IconizeChildFrames(bool bIconize)
+{
+ for ( wxWindowList::Node *node = GetChildren().GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxWindow *win = node->GetData();
+
+ if ( win->IsKindOf(CLASSINFO(wxFrame)) )
+ {
+ ((wxFrame *)win)->Iconize(bIconize);
}
}
}
+
+// make the window modal (all other windows unresponsive)
+void wxFrame::MakeModal(bool modal)
+{
+ if (modal) {
+ wxEnableTopLevelWindows(FALSE);
+ Enable(TRUE); // keep this window enabled
+ }
+ else {
+ wxEnableTopLevelWindows(TRUE);
+ }
+}
+
+
+// ===========================================================================
+// message processing
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// preprocessing
+// ---------------------------------------------------------------------------
+
+bool wxFrame::OS2TranslateMessage(WXMSG* pMsg)
+{
+// TODO: if ( wxWindow::OS2TranslateMessage(pMsg) )
+// return TRUE;
+
+ // try the menu bar accels
+ wxMenuBar *menuBar = GetMenuBar();
+ if ( !menuBar )
+ return FALSE;
+
+// TODO: const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
+// return acceleratorTable.Translate(this, pMsg);
+ return TRUE;
+}
+
+// ---------------------------------------------------------------------------
+// our private (non virtual) message handlers
+// ---------------------------------------------------------------------------
+
+bool wxFrame::HandlePaint()
+{
+ RECT rect;
+// TODO:
+// if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
+// {
+// if ( m_iconized )
+// {
+// HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
+// : (HICON)m_defaultIcon;
+//
+ // Hold a pointer to the dc so long as the OnPaint() message
+ // is being processed
+//
+// PAINTSTRUCT ps;
+// HDC hdc = ::BeginPaint(GetHwnd(), &ps);
+// // Erase background before painting or we get white background
+// OS2DefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
+//
+// if ( hIcon )
+// {
+// RECT rect;
+// TODO: ::GetClientRect(GetHwnd(), &rect);
+
+ // FIXME: why hardcoded?
+// static const int icon_width = 32;
+// static const int icon_height = 32;
+//
+// int icon_x = (int)((rect.right - icon_width)/2);
+// int icon_y = (int)((rect.bottom - icon_height)/2);
+//
+// TODO: ::DrawIcon(hdc, icon_x, icon_y, hIcon);
+// }
+//
+// TODO: ::EndPaint(GetHwnd(), &ps);
+//
+// return TRUE;
+// }
+// else
+// {
+// return wxWindow::HandlePaint();
+// }
+// }
+// else
+// {
+// // nothing to paint - processed
+// return TRUE;
+// }
+ return TRUE;
+}
+
+bool wxFrame::HandleSize(int x, int y, WXUINT id)
+{
+ bool processed = FALSE;
+
+/* switch ( id )
+ {
+ case SIZENORMAL:
+ // only do it it if we were iconized before, otherwise resizing the
+ // parent frame has a curious side effect of bringing it under it's
+ // children
+ if ( !m_iconized )
+ break;
+
+ // restore all child frames too
+ IconizeChildFrames(FALSE);
+
+ // fall through
+
+ case SIZEFULLSCREEN:
+ m_iconized = FALSE;
+ break;
+
+ case SIZEICONIC:
+ // iconize all child frames too
+ IconizeChildFrames(TRUE);
+
+ m_iconized = TRUE;
+ break;
+ }
+*/
+ if ( !m_iconized )
+ {
+ PositionStatusBar();
+ PositionToolBar();
+
+ wxSizeEvent event(wxSize(x, y), m_windowId);
+ event.SetEventObject( this );
+ processed = GetEventHandler()->ProcessEvent(event);
+ }
+
+ return processed;
+}
+
+bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
+{
+ if ( control )
+ {
+ // In case it's e.g. a toolbar.
+ wxWindow *win = wxFindWinFromHandle(control);
+ if ( win )
+// TODO: return win->OS2Command(cmd, id);
+ return TRUE;
+ }
+
+ // handle here commands from menus and accelerators
+ if ( cmd == 0 || cmd == 1 )
+ {
+ if ( wxCurrentPopupMenu )
+ {
+ wxMenu *popupMenu = wxCurrentPopupMenu;
+ wxCurrentPopupMenu = NULL;
+
+// return popupMenu->OS2Command(cmd, id);
+ return TRUE;
+ }
+
+ if ( ProcessCommand(id) )
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+{
+ int item;
+ if ( flags == 0xFFFF && hMenu == 0 )
+ {
+ // menu was removed from screen
+ item = -1;
+ }
+/*
+ else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
+ {
+ item = nItem;
+ }
+*/
+ else
+ {
+ // don't give hints for separators (doesn't make sense) nor for the
+ // items opening popup menus (they don't have them anyhow)
+ return FALSE;
+ }
+
+ wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
+ event.SetEventObject( this );
+
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+// ---------------------------------------------------------------------------
+// the window proc for wxFrame
+// ---------------------------------------------------------------------------
+
+MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+{
+ MRESULT rc = 0;
+ bool processed = FALSE;
+
+// TODO:
+/*
+ switch ( message )
+ {
+ case WM_CLOSE:
+ // if we can't close, tell the system that we processed the
+ // message - otherwise it would close us
+ processed = !Close();
+ break;
+
+ case WM_COMMAND:
+ {
+ WORD id, cmd;
+ WXHWND hwnd;
+ UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
+ &id, &hwnd, &cmd);
+
+ processed = HandleCommand(id, cmd, (WXHWND)hwnd);
+ }
+ break;
+
+ case WM_MENUSELECT:
+ {
+ WXWORD item, flags;
+ WXHMENU hmenu;
+ UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
+
+ processed = HandleMenuSelect(item, flags, hmenu);
+ }
+ break;
+
+ case WM_PAINT:
+ processed = HandlePaint();
+ break;
+
+ case WM_QUERYDRAGICON:
+ {
+ HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
+ : (HICON)(m_defaultIcon);
+ rc = (long)hIcon;
+ processed = rc != 0;
+ }
+ break;
+
+ case WM_SIZE:
+ processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
+ break;
+ }
+*/
+ if ( !processed )
+ rc = wxWindow::OS2WindowProc(hwnd, message, wParam, lParam);
+
+ return rc;
+}
+
..\os2\$D\dirdlg.obj \
..\os2\$D\dnd.obj \
..\os2\$D\filedlg.obj \
+ ..\os2\$D\font.obj \
+ ..\os2\$D\fontdlg.obj \
..\os2\$D\frame.obj \
..\os2\$D\window.obj
dirdlg.obj \
dnd.obj \
filedlg.obj \
+ font.obj \
+ fontdlg.obj \
frame.obj \
window.obj
..\html\$D\htmltag.obj \
..\html\$D\htmlwin.obj \
..\html\$D\htmlwinparser.obj \
-s ..\html\$D\mod_fonts.obj \
+ ..\html\$D\mod_fonts.obj \
..\html\$D\mod_hline.obj \
..\html\$D\mod_image.obj \
..\html\$D\mod_layout.obj \
copy ..\os2\$D\dirdlg.obj
copy ..\os2\$D\dnd.obj
copy ..\os2\$D\filedlg.obj
+ copy ..\os2\$D\font.obj
+ copy ..\os2\$D\fontdlg.obj
copy ..\os2\$D\frame.obj
copy ..\os2\$D\window.obj
projects / wxWidgets.git / commitdiff
