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

Applied patch #9058 (add Hildon 2.0 support)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-24 12:36:34 +00:00
parent 09981ba798
commit 426d19f139
18 changed files with 296 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,9 +18,9 @@
class WXDLLIMPEXP_FWD_BASE wxMutex;
#endif
#if wxUSE_LIBHILDON
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
typedef struct _HildonProgram HildonProgram;
#endif // wxUSE_LIBHILDON
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
//-----------------------------------------------------------------------------
// wxApp
@@ -60,10 +60,10 @@ public:
// must return XVisualInfo pointer (it is not freed by caller)
virtual void *GetXVisualInfo() { return NULL; }
#if wxUSE_LIBHILDON
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// Maemo-specific method: get the main program object
HildonProgram *GetHildonProgram() const { return m_hildonProgram; }
#endif // wxUSE_LIBHILDON
HildonProgram *GetHildonProgram();
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
// implementation only from now on
// -------------------------------
@@ -85,9 +85,9 @@ private:
#endif
guint m_idleSourceId;
#if wxUSE_LIBHILDON
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
HildonProgram *m_hildonProgram;
#endif // wxUSE_LIBHILDON
#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2
DECLARE_DYNAMIC_CLASS(wxApp)
};

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

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

2
include/wx/gtk/menu.h
View File

@@ -49,12 +49,12 @@ public:
// implementation only from now on
void SetInvokingWindow( wxWindow *win );
void UnsetInvokingWindow( wxWindow *win );
GtkWidget *m_menubar; // Public for hildon support
private:
// common part of Append and Insert
bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1);
GtkWidget *m_menubar;
wxWindow *m_invokingWindow;
void Init(size_t n, wxMenu *menus[], const wxString titles[], long style);