Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GPE uses generic dialogs.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-02-28 15:27:11 +00:00
parent 62be94e1b1
commit 47e118ba9a
8 changed files with 147 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/fontdlg.h
View File

@@ -66,7 +66,7 @@ protected:
// ----------------------------------------------------------------------------
#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXCOCOA__) \
|| defined(__WXWINCE__)
|| defined(__WXWINCE__) || defined(__WXGPE__)
#include "wx/generic/fontdlgg.h"
#define wxFontDialog wxGenericFontDialog
#elif defined(__WXMSW__)

2
include/wx/msgdlg.h
View File

@@ -5,7 +5,7 @@
#if wxUSE_MSGDLG
#if defined(__WXUNIVERSAL__)
#if defined(__WXUNIVERSAL__) || defined(__WXGPE__)
#include "wx/generic/msgdlgg.h"
#elif defined(__WXMSW__)
#include "wx/msw/msgdlg.h"

34
src/generic/fontdlgg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXUNIVERSAL__))
#if wxUSE_FONTDLG && (!defined(__WXGTK__) || defined(__WXGPE__) || defined(__WXUNIVERSAL__))
#ifndef WX_PRECOMP
#include <stdio.h>
@@ -42,6 +42,7 @@
#include "wx/cmndata.h"
#include "wx/sizer.h"
#include "wx/fontdlg.h"
#include "wx/settings.h"
//-----------------------------------------------------------------------------
// helper class - wxFontPreviewer
@@ -212,8 +213,6 @@ int wxGenericFontDialog::ShowModal()
void wxGenericFontDialog::CreateWidgets()
{
wxBusyCursor bcur;
wxString
*families = new wxString[6],
*styles = new wxString[3],
@@ -265,9 +264,17 @@ void wxGenericFontDialog::CreateWidgets()
okButton->SetDefault();
// layout
bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
wxSizer *topsizer, *sizer;
topsizer = new wxBoxSizer(wxVERTICAL);
if (!is_pda)
{
// 2 row design
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(familyChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
sizer->Add(styleChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
@@ -279,6 +286,25 @@ void wxGenericFontDialog::CreateWidgets()
sizer->Add(pointSizeChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
sizer->Add(underLineCheckBox, 0, wxALIGN_CENTER | wxLEFT, 10);
topsizer->Add(sizer, 0, wxLEFT| wxTOP| wxRIGHT, 10);
}
else
{
// 3 row design
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(familyChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
sizer->Add(styleChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
topsizer->Add(sizer, 0, wxLEFT| wxTOP| wxRIGHT, 10);
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(weightChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
sizer->Add(colourChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
topsizer->Add(sizer, 0, wxLEFT| wxTOP| wxRIGHT, 10);
sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(pointSizeChoice, 0, wxALIGN_CENTER | wxLEFT, 10);
sizer->Add(underLineCheckBox, 0, wxALIGN_CENTER | wxLEFT, 10);
topsizer->Add(sizer, 0, wxLEFT| wxTOP| wxRIGHT, 10);
}
topsizer->Add(m_previewer, 1, wxALL | wxEXPAND, 10);
topsizer->SetItemMinSize(m_previewer, 430, 100);
@@ -299,6 +325,8 @@ void wxGenericFontDialog::CreateWidgets()
delete[] styles;
delete[] weights;
delete[] pointSizes;
// Don't block events any more
m_useEvents = TRUE;
}

2
src/generic/msgdlgg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_MSGDLG && !defined(__WXGTK20__)
#if wxUSE_MSGDLG && (!defined(__WXGTK20__) || defined(__WXGPE__))
#ifndef WX_PRECOMP
#include "wx/utils.h"

3
src/gtk/fontdlg.cpp
View File

@@ -18,6 +18,8 @@
#if wxUSE_FONTDLG
#ifndef __WXGPE__
#include "wx/fontutil.h"
#include "wx/fontdlg.h"
#include "wx/utils.h"
@@ -189,3 +191,4 @@ void wxFontDialog::SetChosenFont(const char *fontname)
#endif // wxUSE_FONTDLG
#endif // GPE

2
src/gtk/msgdlg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_MSGDLG && defined(__WXGTK20__)
#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
#include "wx/gtk/private.h"
#include <gtk/gtk.h>

3
src/gtk1/fontdlg.cpp
View File

@@ -18,6 +18,8 @@
#if wxUSE_FONTDLG
#ifndef __WXGPE__
#include "wx/fontutil.h"
#include "wx/fontdlg.h"
#include "wx/utils.h"
@@ -189,3 +191,4 @@ void wxFontDialog::SetChosenFont(const char *fontname)
#endif // wxUSE_FONTDLG
#endif // GPE

2
src/gtk1/msgdlg.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop
#endif
#if wxUSE_MSGDLG && defined(__WXGTK20__)
#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
#include "wx/gtk/private.h"
#include <gtk/gtk.h>