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

Remove Hildon framework support.

Browse Source 
The Hildon framework was used for Nokia 770 and other Maemo devices.
This platform discontinued and hasn't seen a new release since 2011.
This commit is contained in:
Tobias Taschner
2015-08-26 22:27:59 +02:00
parent 26a0a24f38
commit 5f75b7506f
23 changed files with 6 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/gtk/app.h
View File

@@ -13,10 +13,6 @@
// classes
//-----------------------------------------------------------------------------
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
typedef struct _HildonProgram HildonProgram;
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
//-----------------------------------------------------------------------------
// wxApp
//-----------------------------------------------------------------------------
@@ -62,11 +58,6 @@ public:
// various bugs arising due to this.
static bool GTKIsUsingGlobalMenu();
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// Maemo-specific method: get the main program object
HildonProgram *GetHildonProgram();
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// implementation only from now on
// -------------------------------
@@ -83,10 +74,6 @@ private:
#endif
unsigned m_idleSourceId;
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
HildonProgram *m_hildonProgram;
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
wxDECLARE_DYNAMIC_CLASS(wxApp);
};

5
include/wx/gtk/frame.h
View File

@@ -50,11 +50,6 @@ public:
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) wxOVERRIDE;
wxPoint GetClientAreaOrigin() const wxOVERRIDE { return wxPoint(0, 0); }
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// in Hildon environment all frames are always shown maximized
virtual bool IsMaximized() const { return true; }
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// implementation from now on
// --------------------------

58
include/wx/gtk/hildon/notifmsg.h
View File

@@ -1,58 +0,0 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/gtk/hildon/notifmsg.h
// Purpose: Hildon implementation of wxNotificationMessage
// Author: Vadim Zeitlin
// Created: 2007-11-21
// Copyright: (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_HILDON_NOTIFMSG_H_
#define _WX_GTK_HILDON_NOTIFMSG_H_
typedef struct _HildonBanner HildonBanner;
// ----------------------------------------------------------------------------
// wxNotificationMessage
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxNotificationMessage : public wxNotificationMessageBase
{
public:
wxNotificationMessage() { Init(); }
wxNotificationMessage(const wxString& title,
const wxString& message = wxString(),
wxWindow *parent = NULL)
: wxNotificationMessageBase(title, message, parent)
{
Init();
}
virtual ~wxNotificationMessage();
virtual bool Show(int timeout = Timeout_Auto);
virtual bool Close();
private:
void Init() { m_banner = NULL; }
// return the string containing markup for both the title and, if
// specified, the message
wxString HildonGetMarkup() const;
// returns the widget of the parent GtkWindow to use or NULL
GtkWidget *HildonGetWindow() const;
// the banner we're showing, only non-NULL if it's an animation or progress
// banner as the informational dialog times out on its own and we don't
// need to store it (nor do we have any way to get its widget anyhow)
GtkWidget *m_banner;
wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);
};
#endif // _WX_GTK_HILDON_NOTIFMSG_H_