Ryan's cumulative wxActiveX and media control patch (1427775)

[wxWidgets.git] / include / wx / msw / toplevel.h

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index 377a446cce4cc9f77e16e7402ccd8d7db98e1a3d..3647a33b9b62a938f1267201014e7aa9d2ee8434 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -12,10 +12,6 @@
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 
 #ifndef _WX_MSW_TOPLEVEL_H_
 #define _WX_MSW_TOPLEVEL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowMSW
 // ----------------------------------------------------------------------------


@@ -50,6 +46,8 @@ public:
     virtual ~wxTopLevelWindowMSW();
 
     // implement base class pure virtuals
     virtual ~wxTopLevelWindowMSW();
 
     // implement base class pure virtuals

+    virtual void SetTitle( const wxString& title);
+    virtual wxString GetTitle() const;

     virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);


@@ -86,8 +84,23 @@ public:
     virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
     virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
     virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
     virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);

+    virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);

 #endif // __SMARTPHONE__ && __WXWINCE__
 
 #endif // __SMARTPHONE__ && __WXWINCE__
 

+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    // Soft Input Panel (SIP) change notification
+    virtual bool HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam);
+#endif
+
+    // translate wxWidgets flags to Windows ones
+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
+
+    // choose the right parent to use with CreateWindow()
+    virtual WXHWND MSWGetParent() const;
+
+    // window proc for the frames
+    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();


@@ -107,12 +120,6 @@ protected:
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 

-    // translate wxWidgets flags to Windows ones
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
-
-    // choose the right parent to use with CreateWindow()
-    virtual WXHWND MSWGetParent() const;
-

     // is the window currently iconized?
     bool m_iconized;
 
     // is the window currently iconized?
     bool m_iconized;
 


@@ -165,9 +172,10 @@ protected:
     void ReloadAllButtons();
 #endif // __SMARTPHONE__ && __WXWINCE__
 
     void ReloadAllButtons();
 #endif // __SMARTPHONE__ && __WXWINCE__
 

-    // Empty menubar for dialogs
-#ifdef __POCKETPC__
-    WXHWND                   m_menuBarHWND;
+private:
+
+#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
+    void* m_activateInfo;

 #endif
 
     DECLARE_EVENT_TABLE()
 #endif
 
     DECLARE_EVENT_TABLE()


@@ -175,4 +183,3 @@ protected:
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_
 };
 
 #endif // _WX_MSW_TOPLEVEL_H_

-