Added WS_POPUP for MicroWindows dialogs

[wxWidgets.git] / src / msw / frame.cpp

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 6ff16e1ff835f2f19da9eab37ab23a50b5c1ed0f..a7f299a05d37a119a4706f94a20e7c2e4b7bf611 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -82,6 +82,10 @@ END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameMSW, wxWindow)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrameMSW, wxWindow)
 

+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -379,21 +383,31 @@ void wxFrameMSW::Restore()
 
 bool wxFrameMSW::IsIconized() const
 {
 
 bool wxFrameMSW::IsIconized() const
 {

+#ifdef __WXMICROWIN__
+  // TODO
+  return FALSE;
+#else

   ((wxFrameMSW *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
   return m_iconized;
   ((wxFrameMSW *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0);
   return m_iconized;

+#endif

 }
 
 // Is it maximized?
 bool wxFrameMSW::IsMaximized() const
 {
 }
 
 // Is it maximized?
 bool wxFrameMSW::IsMaximized() const
 {

+#ifdef __WXMICROWIN__
+  // TODO
+  return FALSE;
+#else

     return (::IsZoomed(GetHwnd()) != 0);
     return (::IsZoomed(GetHwnd()) != 0);

+#endif

 }
 
 void wxFrameMSW::SetIcon(const wxIcon& icon)
 {
     wxFrameBase::SetIcon(icon);
 
 }
 
 void wxFrameMSW::SetIcon(const wxIcon& icon)
 {
     wxFrameBase::SetIcon(icon);
 

-#if defined(__WIN95__)
+#if defined(__WIN95__) && !defined(__WXMICROWIN__)

     if ( m_icon.Ok() )
     {
         SendMessage(GetHwnd(), WM_SETICON,
     if ( m_icon.Ok() )
     {
         SendMessage(GetHwnd(), WM_SETICON,


@@ -403,7 +417,7 @@ void wxFrameMSW::SetIcon(const wxIcon& icon)
 }
 
 // generate an artificial resize event
 }
 
 // generate an artificial resize event

-void wxFrame::SendSizeEvent()
+void wxFrameMSW::SendSizeEvent()

 {
     RECT r;
 #ifdef __WIN16__
 {
     RECT r;
 #ifdef __WIN16__


@@ -532,10 +546,12 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
 
 void wxFrameMSW::InternalSetMenuBar()
 {
 
 void wxFrameMSW::InternalSetMenuBar()
 {

+#ifndef __WXMICROWIN__

     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {
         wxLogLastError(wxT("SetMenu"));
     }
     if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) )
     {
         wxLogLastError(wxT("SetMenu"));
     }

+#endif

 }
 
 #endif // wxUSE_MENUS_NATIVE
 }
 
 #endif // wxUSE_MENUS_NATIVE


@@ -584,8 +600,10 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style)
         }
 #endif // wxUSE_TOOLBAR
 
         }
 #endif // wxUSE_TOOLBAR
 

+#ifndef __WXMICROWIN__

         if (style & wxFULLSCREEN_NOMENUBAR)
             SetMenu((HWND)GetHWND(), (HMENU) NULL);
         if (style & wxFULLSCREEN_NOMENUBAR)
             SetMenu((HWND)GetHWND(), (HMENU) NULL);

+#endif

 
 #if wxUSE_STATUSBAR
         wxStatusBar *theStatusBar = GetStatusBar();
 
 #if wxUSE_STATUSBAR
         wxStatusBar *theStatusBar = GetStatusBar();


@@ -675,8 +693,10 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style)
         }
 #endif // wxUSE_STATUSBAR
 
         }
 #endif // wxUSE_STATUSBAR
 

+#ifndef __WXMICROWIN__

         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
         if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
             SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);

+#endif

 
         Maximize(m_fsIsMaximized);
         SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
 
         Maximize(m_fsIsMaximized);
         SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);


@@ -955,6 +975,7 @@ bool wxFrameMSW::HandlePaint()
     RECT rect;
     if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
     {
     RECT rect;
     if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
     {

+#ifndef __WXMICROWIN__

         if ( m_iconized )
         {
             HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
         if ( m_iconized )
         {
             HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)


@@ -988,6 +1009,7 @@ bool wxFrameMSW::HandlePaint()
             return TRUE;
         }
         else
             return TRUE;
         }
         else

+ #endif

         {
             return wxWindow::HandlePaint();
         }
         {
             return wxWindow::HandlePaint();
         }


@@ -1002,6 +1024,7 @@ bool wxFrameMSW::HandlePaint()
 bool wxFrameMSW::HandleSize(int x, int y, WXUINT id)
 {
     bool processed = FALSE;
 bool wxFrameMSW::HandleSize(int x, int y, WXUINT id)
 {
     bool processed = FALSE;

+#ifndef __WXMICROWIN__

 
     switch ( id )
     {
 
     switch ( id )
     {


@@ -1032,6 +1055,7 @@ bool wxFrameMSW::HandleSize(int x, int y, WXUINT id)
             m_iconized = TRUE;
             break;
     }
             m_iconized = TRUE;
             break;
     }

+#endif

 
     if ( !m_iconized )
     {
 
     if ( !m_iconized )
     {


@@ -1091,10 +1115,12 @@ bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
         // menu was removed from screen
         item = -1;
     }
         // menu was removed from screen
         item = -1;
     }

+#ifndef __WXMICROWIN__

     else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
     {
         item = nItem;
     }
     else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
     {
         item = nItem;
     }

+#endif

     else
     {
 #if wxUSE_STATUSBAR
     else
     {
 #if wxUSE_STATUSBAR


@@ -1146,6 +1172,7 @@ long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             }
             break;
 
             }
             break;
 

+#ifndef __WXMICROWIN__

         case WM_MENUSELECT:
             {
                 WXWORD item, flags;
         case WM_MENUSELECT:
             {
                 WXWORD item, flags;


@@ -1155,11 +1182,13 @@ long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 processed = HandleMenuSelect(item, flags, hmenu);
             }
             break;
                 processed = HandleMenuSelect(item, flags, hmenu);
             }
             break;

+#endif

 
         case WM_PAINT:
             processed = HandlePaint();
             break;
 
 
         case WM_PAINT:
             processed = HandlePaint();
             break;
 

+#ifndef __WXMICROWIN__

         case WM_QUERYDRAGICON:
             {
                 HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
         case WM_QUERYDRAGICON:
             {
                 HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)


@@ -1168,6 +1197,7 @@ long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 processed = rc != 0;
             }
             break;
                 processed = rc != 0;
             }
             break;

+#endif

 
         case WM_SIZE:
             processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
 
         case WM_SIZE:
             processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);