Remove Hildon framework support.
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:
@@ -47,15 +47,6 @@
|
||||
#include "wx/gtk/private/gtk2-compat.h"
|
||||
#include "wx/gtk/private/win_gtk.h"
|
||||
|
||||
#if wxUSE_LIBHILDON
|
||||
#include <hildon-widgets/hildon-program.h>
|
||||
#include <hildon-widgets/hildon-window.h>
|
||||
#endif // wxUSE_LIBHILDON
|
||||
|
||||
#if wxUSE_LIBHILDON2
|
||||
#include <hildon/hildon.h>
|
||||
#endif // wxUSE_LIBHILDON2
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// data
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -585,14 +576,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
// e.g. in wxTaskBarIconAreaGTK
|
||||
if (m_widget == NULL)
|
||||
{
|
||||
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
|
||||
// we must create HildonWindow and not a normal GtkWindow as the latter
|
||||
// doesn't look correctly in Maemo environment and it must also be
|
||||
// registered with the main program object
|
||||
m_widget = hildon_window_new();
|
||||
hildon_program_add_window(wxTheApp->GetHildonProgram(),
|
||||
HILDON_WINDOW(m_widget));
|
||||
#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2
|
||||
m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||
if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)
|
||||
{
|
||||
@@ -619,7 +602,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
style |= wxFRAME_NO_TASKBAR;
|
||||
}
|
||||
}
|
||||
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2/!wxUSE_LIBHILDON || !wxUSE_LIBHILDON2
|
||||
|
||||
g_object_ref(m_widget);
|
||||
}
|
||||
@@ -802,15 +784,6 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
|
||||
g_source_remove(m_netFrameExtentsTimerId);
|
||||
}
|
||||
|
||||
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
|
||||
// it can also be a (standard) dialog
|
||||
if ( HILDON_IS_WINDOW(m_widget) )
|
||||
{
|
||||
hildon_program_remove_window(wxTheApp->GetHildonProgram(),
|
||||
HILDON_WINDOW(m_widget));
|
||||
}
|
||||
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
|
||||
|
||||
if (m_grabbed)
|
||||
{
|
||||
wxFAIL_MSG(wxT("Window still grabbed"));
|
||||
@@ -1100,25 +1073,8 @@ void wxTopLevelWindowGTK::GTKDoGetSize(int *width, int *height) const
|
||||
size.y -= m_decorSize.top + m_decorSize.bottom;
|
||||
if (size.x < 0) size.x = 0;
|
||||
if (size.y < 0) size.y = 0;
|
||||
#if wxUSE_LIBHILDON2
|
||||
if (width) {
|
||||
if (size.x == 720)
|
||||
*width = 696;
|
||||
else
|
||||
*width = size.x;
|
||||
}
|
||||
if (height) {
|
||||
if (size.y == 420)
|
||||
*height = 396;
|
||||
else if (size.y == 270)
|
||||
*height = 246;
|
||||
else
|
||||
*height = size.y;
|
||||
}
|
||||
#else // wxUSE_LIBHILDON2
|
||||
if (width) *width = size.x;
|
||||
if (height) *height = size.y;
|
||||
#endif // wxUSE_LIBHILDON2 /!wxUSE_LIBHILDON2
|
||||
}
|
||||
|
||||
void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
|
||||
|
Reference in New Issue
Block a user