/////////////////////////////////////////////////////////////////////////////
-// Name: control.h
+// Name: wx/os2/control.h
// Purpose: wxControl class
// Author: David Webster
// Modified by:
,const wxString& rsName = wxControlNameStr
)
{
- Create( pParent
- ,vId
- ,rPos
- ,rSize
- ,lStyle
- ,rValidator
- ,rsName
- );
+ Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName );
}
virtual ~wxControl();
);
virtual void SetLabel(const wxString& rsLabel);
+ virtual wxString GetLabel() const { return m_label; }
//
// Simulates an event
//
// For ownerdraw items
//
- virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
+ virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; };
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
wxArrayLong& GetSubcontrols() { return m_aSubControls; }
,long lStyle
);
//
- // Create the control of the given class with the given style, returns FALSE
+ // Create the control of the given class with the given style, returns false
// if creation failed.
//
bool OS2CreateControl( const wxChar* zClassname
inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
private:
- int m_nXComp;
- int m_nYComp;
- DECLARE_EVENT_TABLE()
+ int m_nXComp;
+ int m_nYComp;
+
+ wxString m_label;
+
+ DECLARE_EVENT_TABLE()
}; // end of wxControl
#endif // _WX_CONTROL_H_
-
virtual void SetString( int nNum
,const wxString& rsLabel
);
- virtual bool SetStringSelection(const wxString& rsStr);
+ virtual bool SetStringSelection(const wxString& rsStr);
- void SetLabel( int nItem
- ,const wxString& rsLabel
- );
- void SetLabel( int item
- ,wxBitmap* pBitmap
- );
- wxString GetLabel(int nItem) const;
+ virtual void SetLabel(const wxString& rsLabel)
+ { wxControl::SetLabel(rsLabel); }
+ virtual wxString GetLabel() const
+ { return wxControl::GetLabel(); }
+ void SetLabel( int nItem, const wxString& rsLabel );
+ void SetLabel( int item, wxBitmap* pBitmap );
+ wxString GetLabel(int nItem) const;
protected:
virtual wxSize DoGetBestSize(void) const;
,int nHeight
,int nSizeFlags = wxSIZE_AUTO
);
- wxSize GetMaxButtonSize(void) const;
- wxSize GetTotalButtonSize(const wxSize& rSizeBtn) const;
- void SubclassRadioButton(WXHWND hWndBtn);
+ wxSize GetMaxButtonSize(void) const;
+ wxSize GetTotalButtonSize(const wxSize& rSizeBtn) const;
+ void SubclassRadioButton(WXHWND hWndBtn);
- WXHWND* m_ahRadioButtons;
- int m_nMajorDim ;
- int* m_pnRadioWidth; // for bitmaps
- int* m_pnRadioHeight;
- int m_nNoItems;
- int m_nNoRowsOrCols;
- int m_nSelectedButton;
- int m_nSizeFlags;
+ WXHWND* m_ahRadioButtons;
+ int m_nMajorDim ;
+ int* m_pnRadioWidth; // for bitmaps
+ int* m_pnRadioHeight;
+ int m_nNoItems;
+ int m_nNoRowsOrCols;
+ int m_nSelectedButton;
+ int m_nSizeFlags;
private:
- inline wxString GetLabel() const
- { return wxWindowBase::GetLabel(); }
- inline void SetLabel(const wxString& rsLabel)
- { wxWindowBase::SetLabel(rsLabel); }
DECLARE_DYNAMIC_CLASS(wxRadioBox)
}; // end of wxRadioBox
-#endif
- // _WX_RADIOBOX_H_
+#endif // _WX_RADIOBOX_H_
///////////////////////////////////////////////////////////////////////////////
-// Name: wx/msw/toplevel.h
-// Purpose: wxTopLevelWindowMSW is the MSW implementation of wxTLW
+// Name: wx/os2/toplevel.h
+// Purpose: wxTopLevelWindowOS2 is the OS2 implementation of wxTLW
// Author: Vadim Zeitlin
// Modified by:
// Created: 20.09.01
#ifndef _WX_MSW_TOPLEVEL_H_
#define _WX_MSW_TOPLEVEL_H_
-enum ETemplateID { kResizeableDialog = 130
- ,kCaptionDialog
- ,kNoCaptionDialog
- };
+enum ETemplateID
+{
+ kResizeableDialog = 130,
+ kCaptionDialog,
+ kNoCaptionDialog
+};
// ----------------------------------------------------------------------------
// wxTopLevelWindowOS2
//
// Implement base class pure virtuals
//
- virtual void Iconize(bool bIconize = TRUE);
- inline virtual bool IsFullScreen(void) const { return m_bFsIsShowing; }
- virtual bool IsIconized(void) const;
- virtual bool IsMaximized(void) const;
- virtual void Maximize(bool bMaximize = TRUE);
- virtual void Restore(void);
- virtual void SendSizeEvent(void);
- virtual void SetIcon(const wxIcon& rIcon);
- virtual void SetIcons(const wxIconBundle& rIcons);
+ virtual void SetTitle( const wxString& title);
+ virtual wxString GetTitle() const;
+
+ virtual void Iconize(bool bIconize = true);
+ virtual bool IsFullScreen(void) const { return m_bFsIsShowing; }
+ virtual bool IsIconized(void) const;
+ virtual bool IsMaximized(void) const;
+ virtual void Maximize(bool bMaximize = true);
+ virtual void Restore(void);
+ virtual void SendSizeEvent(void);
+ virtual void SetIcon(const wxIcon& rIcon);
+ virtual void SetIcons(const wxIconBundle& rIcons);
- virtual bool Show(bool bShow = TRUE);
- virtual bool ShowFullScreen( bool bShow
- ,long lStyle = wxFULLSCREEN_ALL
- );
+ virtual bool Show(bool bShow = true);
+ virtual bool ShowFullScreen( bool bShow,
+ long lStyle = wxFULLSCREEN_ALL );
//
- // EnableCloseButton(FALSE) may be used to remove the "Close"
+ // EnableCloseButton(false) may be used to remove the "Close"
// button from the title bar
//
- bool EnableCloseButton(bool bEnable = TRUE);
- HWND GetFrame(void) const { return m_hFrame; }
+ bool EnableCloseButton(bool bEnable = true);
+ HWND GetFrame(void) const { return m_hFrame; }
//
// Implementation from now on
// --------------------------
//
- PSWP GetSwpClient(void) { return &m_vSwpClient; }
+ PSWP GetSwpClient(void) { return &m_vSwpClient; }
+
+ void OnActivate(wxActivateEvent& rEvent);
- void OnActivate(wxActivateEvent& rEvent);
+ void SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; }
+ wxWindow* GetLastFocus(void) const { return m_pWinLastFocused; }
- void SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; }
- wxWindow* GetLastFocus(void) const { return m_pWinLastFocused; }
protected:
+
//
// Common part of all ctors
//
void Init(void);
//
- // Create a new frame, return FALSE if it couldn't be created
+ // Create a new frame, return false if it couldn't be created
//
bool CreateFrame( const wxString& rsTitle
,const wxPoint& rPos
//
// Create a new dialog using the given dialog template from resources,
- // return FALSE if it couldn't be created
+ // return false if it couldn't be created
//
bool CreateDialog( ULONG ulDlgTemplate
,const wxString& rsTitle
//
// Is the frame currently iconized?
//
- bool m_bIconized;
+ bool m_bIconized;
//
// Should the frame be maximized when it will be shown? set by Maximize()
// when it is called while the frame is hidden
//
- bool m_bMaximizeOnShow;
+ bool m_bMaximizeOnShow;
//
// Data to save/restore when calling ShowFullScreen
//
- long m_lFsStyle; // Passed to ShowFullScreen
- wxRect m_vFsOldSize;
- long m_lFsOldWindowStyle;
- bool m_bFsIsMaximized;
- bool m_bFsIsShowing;
+ long m_lFsStyle; // Passed to ShowFullScreen
+ wxRect m_vFsOldSize;
+ long m_lFsOldWindowStyle;
+ bool m_bFsIsMaximized;
+ bool m_bFsIsShowing;
- wxWindow* m_pWinLastFocused;
+ wxWindow* m_pWinLastFocused;
- WXHWND m_hFrame;
- SWP m_vSwp;
- SWP m_vSwpClient;
- static bool m_sbInitialized;
- static wxWindow* m_spHiddenParent;
+ WXHWND m_hFrame;
+ SWP m_vSwp;
+ SWP m_vSwpClient;
+ static bool m_sbInitialized;
+ static wxWindow* m_spHiddenParent;
DECLARE_EVENT_TABLE()
}; // end of CLASS wxTopLevelWindowOS2
#endif // _WX_MSW_TOPLEVEL_H_
-
/////////////////////////////////////////////////////////////////////////////
-// Name: window.h
+// Name: wx/os2/window.h
// Purpose: wxWindow class
// Author: David Webster
// Modified by:
);
// implement base class pure virtuals
- virtual void SetTitle(const wxString& rTitle);
- virtual wxString GetTitle(void) const;
+ virtual void SetLabel(const wxString& label);
+ virtual wxString GetLabel(void) const;
virtual void Raise(void);
virtual void Lower(void);
virtual bool Show(bool bShow = true);
extern wxWinHashTable *wxWinHandleHash;
-#endif
- // _WX_WINDOW_H_
+#endif // _WX_WINDOW_H_
#if defined(__WXMSW__) || \
defined(__WXMGL__) || \
defined(__WXMOTIF__) || \
+ defined(__WXPM__) || \
defined(__WXGTK__)
// FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
#if !defined(__WXMSW__) && \
!defined(__WXMGL__) && \
!defined(__WXMOTIF__) && \
+ !defined(__WXPM__) && \
!defined(__WXGTK__)
// FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
/////////////////////////////////////////////////////////////////////////////
-// Name: control.cpp
+// Name: src/os2/control.cpp
// Purpose: wxControl class
// Author: David Webster
// Modified by:
m_isBeingDeleted = true;
}
-bool wxControl::OS2CreateControl(
- const wxChar* zClassname
-, const wxString& rsLabel
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lStyle
-)
+bool wxControl::OS2CreateControl( const wxChar* zClassname,
+ const wxString& rsLabel,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle )
{
- WXDWORD dwExstyle;
- WXDWORD dwStyle = OS2GetStyle( lStyle
- ,&dwExstyle
- );
+ WXDWORD dwExstyle;
+ WXDWORD dwStyle = OS2GetStyle( lStyle, &dwExstyle );
return OS2CreateControl( zClassname
,dwStyle
if (m_isShown )
dwStyle |= WS_VISIBLE;
- wxWindow* pParent = GetParent();
- PSZ zClass = "";
+ wxWindow* pParent = GetParent();
+ PSZ zClass = "";
if (!pParent)
- return FALSE;
+ return false;
if ((wxStrcmp(zClassname, _T("COMBOBOX"))) == 0)
zClass = WC_COMBOBOX;
zClass = WC_CONTAINER;
dwStyle |= WS_VISIBLE;
- wxString sLabel = ::wxPMTextToLabel(rsLabel);
+ m_label = rsLabel;
+ wxString label = ::wxPMTextToLabel(m_label);
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,(PSZ)zClass // Window class
- ,(PSZ)sLabel.c_str() // Initial Text
+ ,(PSZ)label.c_str() // Initial Text
,(ULONG)dwStyle // Style flags
,(LONG)0 // X pos of origin
,(LONG)0 // Y pos of origin
wxLogError(wxT("Failed to create a control of class '%s'"), zClassname);
#endif // DEBUG
- return FALSE;
+ return false;
}
//
// Subclass again for purposes of dialog editing mode
SetXComp(0);
SetYComp(0);
- SetSize( rPos.x
- ,rPos.y
- ,rSize.x
- ,rSize.y
- );
+ SetSize( rPos.x, rPos.y, rSize.x, rSize.y );
return true;
} // end of wxControl::OS2CreateControl
return (WXHBRUSH)pBrush->GetResourceHandle();
} // end of wxControl::OnCtlColor
-void wxControl::OnEraseBackground(
- wxEraseEvent& rEvent
-)
+void wxControl::OnEraseBackground( wxEraseEvent& rEvent )
{
RECTL vRect;
HPS hPS = rEvent.GetDC()->GetHPS();
::WinFillRect(hPS, &vRect, GetBackgroundColour().GetPixel());
} // end of wxControl::OnEraseBackground
-WXDWORD wxControl::OS2GetStyle(
- long lStyle
-, WXDWORD* pdwExstyle
-) const
+WXDWORD wxControl::OS2GetStyle( long lStyle, WXDWORD* pdwExstyle ) const
{
- long dwStyle = wxWindow::OS2GetStyle( lStyle
- ,pdwExstyle
- );
+ long dwStyle = wxWindow::OS2GetStyle( lStyle, pdwExstyle );
if (AcceptsFocus())
{
return dwStyle;
} // end of wxControl::OS2GetStyle
-void wxControl::SetLabel(
- const wxString& rsLabel
-)
+void wxControl::SetLabel( const wxString& rsLabel )
{
- wxString sLabel = ::wxPMTextToLabel(rsLabel);
-
- ::WinSetWindowText(GetHwnd(), (PSZ)sLabel.c_str());
+ if(rsLabel != m_label)
+ {
+ m_label = rsLabel;
+ wxString label = ::wxPMTextToLabel(rsLabel);
+ ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
+ }
} // end of wxControl::SetLabel
// ---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.cpp
+// Name: src/os2/dialog.cpp
// Purpose: wxDialog class
// Author: David Webster
// Modified by:
void wxDialog::Init()
{
m_pOldFocus = (wxWindow *)NULL;
- m_isShown = FALSE;
+ m_isShown = false;
m_pWindowDisabler = (wxWindowDisabler *)NULL;
m_modalData = NULL;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
return parent;
}
-bool wxDialog::Show(
- bool bShow
-)
+bool wxDialog::Show( bool bShow )
{
if ( bShow == IsShown() )
return false;
wxDialogBase::Show(bShow);
- if (GetTitle().c_str())
- ::WinSetWindowText((HWND)GetHwnd(), (PSZ)GetTitle().c_str());
+ wxString title = GetTitle();
+ if (!title.empty())
+ ::WinSetWindowText((HWND)GetHwnd(), (PSZ)title.c_str());
if ( bShow )
{
extern bool gbInOnIdle;
bool bWasInOnIdle = gbInOnIdle;
- gbInOnIdle = FALSE;
+ gbInOnIdle = false;
// enter and run the modal loop
{
Refresh();
} // end of wxDialog::OnSysColourChanged
-MRESULT wxDialog::OS2WindowProc(
- WXUINT uMessage
-, WXWPARAM wParam
-, WXLPARAM lParam
-)
+MRESULT wxDialog::OS2WindowProc( WXUINT uMessage, WXWPARAM wParam, WXLPARAM lParam )
{
- MRESULT rc = 0;
- bool bProcessed = FALSE;
+ MRESULT rc = 0;
+ bool bProcessed = false;
switch (uMessage)
{
//
// Create a dummy radio control to end the group.
//
- (void)::WinCreateWindow ( GetHwndOf(pParent)
- ,WC_BUTTON
- ,""
- ,WS_GROUP | BS_AUTORADIOBUTTON
- ,0, 0, 0, 0
- ,GetWinHwnd(pParent)
- ,HWND_TOP
- ,(HMENU)NewControlId()
- ,NULL
- ,NULL
+ (void)::WinCreateWindow ( GetHwndOf(pParent),
+ WC_BUTTON,
+ "",
+ WS_GROUP | BS_AUTORADIOBUTTON,
+ 0, 0, 0, 0,
+ GetWinHwnd(pParent),
+ HWND_TOP,
+ (HMENU)NewControlId(),
+ NULL,
+ NULL
);
SetFont(*wxSMALL_FONT);
fnWndProcRadioBox = (WXFARPROC)::WinSubclassWindow( GetHwnd()
return m_nSelectedButton;
} // end of wxRadioBox::GetSelection
-void wxRadioBox::GetSize(
- int* pnWidth
-, int* pnHeight
-) const
+void wxRadioBox::GetSize( int* pnWidth, int* pnHeight ) const
{
RECT vRect;
int i;
//
// And also wide enough for its label
//
- GetTextExtent( GetTitle()
- ,&nWidthLabel
- ,NULL
- );
+ GetTextExtent( GetLabel(), &nWidthLabel, NULL );
nWidthLabel += RADIO_SIZE;
if (nWidthLabel > nWidth)
nWidth = nWidthLabel;
);
} // end of wxRadioBtnWndProc
-MRESULT EXPENTRY wxRadioBoxWndProc(
- HWND hWnd
-, UINT uMessage
-, MPARAM wParam
-, MPARAM lParam
-)
+MRESULT EXPENTRY wxRadioBoxWndProc( HWND hWnd,
+ UINT uMessage,
+ MPARAM wParam,
+ MPARAM lParam )
{
- return (fnWndProcRadioBox( hWnd
- ,(ULONG)uMessage
- ,(MPARAM)wParam
- ,(MPARAM)lParam
- )
+ return (fnWndProcRadioBox( hWnd,
+ (ULONG)uMessage,
+ (MPARAM)wParam,
+ (MPARAM)lParam )
);
} // end of wxRadioBoxWndProc
///////////////////////////////////////////////////////////////////////////////
-// Name: os2/toplevel.cpp
+// Name: src/os2/toplevel.cpp
// Purpose: implements wxTopLevelWindow for OS/2
// Author: Vadim Zeitlin
// Modified by:
// ----------------------------------------------------------------------------
// the name of the default wxWidgets class
-extern void wxAssociateWinWithHandle( HWND hWnd
- ,wxWindowOS2* pWin
- );
-bool wxTopLevelWindowOS2::m_sbInitialized = FALSE;
-wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL;
+extern void wxAssociateWinWithHandle( HWND hWnd, wxWindowOS2* pWin );
+
+bool wxTopLevelWindowOS2::m_sbInitialized = false;
+wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL;
// ============================================================================
// wxTopLevelWindowOS2 implementation
//
// The HWND of the hidden parent
//
- static HWND m_shWnd;
+ static HWND m_shWnd;
//
// The class used to create it
//
- static const wxChar* m_szClassName;
+ static const wxChar* m_szClassName;
DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule)
}; // end of CLASS wxTLWHiddenParentModule
void wxTopLevelWindowOS2::Init()
{
- m_bIconized = m_bMaximizeOnShow = FALSE;
+ m_bIconized = m_bMaximizeOnShow = false;
//
// Unlike (almost?) all other windows, frames are created hidden
//
- m_isShown = FALSE;
+ m_isShown = false;
//
// Data to save/restore when calling ShowFullScreen
m_lFsStyle = 0;
m_lFsOldWindowStyle = 0;
- m_bFsIsMaximized = FALSE;
- m_bFsIsShowing = FALSE;
+ m_bFsIsMaximized = false;
+ m_bFsIsShowing = false;
m_hFrame = NULLHANDLE;
memset(&m_vSwp, 0, sizeof(SWP));
wxLogSysError(wxT("Can't create dialog using template '%ld'"), ulDlgTemplate);
- return FALSE;
+ return false;
}
//
,(PVOID)&lColor
))
{
- return FALSE;
+ return false;
}
::WinSetWindowPos( GetHwnd()
::WinQueryWindowPos(GetHwnd(), GetSwp());
m_hFrame = m_hWnd;
SubclassWin(m_hWnd);
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::CreateDialog
-bool wxTopLevelWindowOS2::CreateFrame(
- const wxString& rsTitle
-, const wxPoint& rPos
-, const wxSize& rSize
-)
+bool wxTopLevelWindowOS2::CreateFrame( const wxString& rsTitle,
+ const wxPoint& rPos,
+ const wxSize& rSize )
{
- WXDWORD lExflags;
- WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags);
- long lStyle = GetWindowStyleFlag();
- int nX = rPos.x;
- int nY = rPos.y;
- int nWidth = rSize.x;
- int nHeight = rSize.y;
- ULONG ulStyleFlags = 0L;
- ERRORID vError;
- wxString sError;
- wxWindow* pParent = GetParent();
- HWND hParent;
- HWND hFrame;
- HWND hClient;
+ WXDWORD lExflags;
+ WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags);
+ long lStyle = GetWindowStyleFlag();
+ int nX = rPos.x;
+ int nY = rPos.y;
+ int nWidth = rSize.x;
+ int nHeight = rSize.y;
+ ULONG ulStyleFlags = 0L;
+ ERRORID vError;
+ wxString sError;
+ wxWindow* pParent = GetParent();
+ HWND hParent;
+ HWND hFrame;
+ HWND hClient;
if (pParent)
hParent = GetHwndOf(pParent);
// Clear the visible flag, we always call show
//
ulStyleFlags &= (unsigned long)~WS_VISIBLE;
- m_bIconized = FALSE;
+ m_bIconized = false;
//
// Create the frame window: We break ranks with other ports now
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
- return FALSE;
+ return false;
}
//
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Error creating frame. Error: %s\n"), sError.c_str());
- return FALSE;
+ return false;
}
//
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogError(_T("Error sizing frame. Error: %s\n"), sError.c_str());
- return FALSE;
+ return false;
}
lStyle = ::WinQueryWindowULong( m_hWnd
,QWL_STYLE
,QWL_STYLE
,lStyle
);
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::CreateFrame
bool wxTopLevelWindowOS2::Create(
m_bIconized = nShowCmd == SWP_MINIMIZE;
} // end of wxTopLevelWindowOS2::DoShowWindow
-bool wxTopLevelWindowOS2::Show(
- bool bShow
-)
+bool wxTopLevelWindowOS2::Show( bool bShow )
{
- int nShowCmd;
- SWP vSwp;
+ int nShowCmd;
+ SWP vSwp;
if (bShow != IsShown() )
{
}
else
{
- return FALSE;
+ return false;
}
if (bShow)
{
if (m_bMaximizeOnShow)
{
nShowCmd = SWP_MAXIMIZE;
- m_bMaximizeOnShow = FALSE;
+ m_bMaximizeOnShow = false;
}
else
{
if (bShow)
{
- wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
+ wxActivateEvent vEvent(wxEVT_ACTIVATE, true, m_windowId);
::WinQueryWindowPos(m_hFrame, &vSwp);
m_bIconized = ( vSwp.fl & SWP_MINIMIZE ) == SWP_MINIMIZE ;
//
if (GetParent())
{
- HWND hWndParent = GetHwndOf(GetParent());
+ HWND hWndParent = GetHwndOf(GetParent());
::WinQueryWindowPos(hWndParent, &vSwp);
m_bIconized = (vSwp.fl & SWP_MINIMIZE)==SWP_MINIMIZE;
::WinEnableWindow(hWndParent, TRUE);
}
}
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::Show
// ----------------------------------------------------------------------------
return (m_vSwp.fl & SWP_MAXIMIZE) == SWP_MAXIMIZE;
} // end of wxTopLevelWindowOS2::IsMaximized
-void wxTopLevelWindowOS2::Iconize(
- bool bIconize
-)
+void wxTopLevelWindowOS2::SetTitle( const wxString& title)
+{
+ SetLabel(title);
+}
+
+wxString wxTopLevelWindowOS2::GetTitle() const
+{
+ return GetLabel();
+}
+
+void wxTopLevelWindowOS2::Iconize( bool bIconize )
{
DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
} // end of wxTopLevelWindowOS2::Iconize
// also update the current state
::WinQueryWindowPos(m_hFrame, (PSWP)&m_vSwp);
if (m_vSwp.fl & SWP_MINIMIZE)
- ((wxTopLevelWindow*)this)->m_bIconized = TRUE;
+ ((wxTopLevelWindow*)this)->m_bIconized = true;
else
- ((wxTopLevelWindow*)this)->m_bIconized = FALSE;
+ ((wxTopLevelWindow*)this)->m_bIconized = false;
return m_bIconized;
} // end of wxTopLevelWindowOS2::IsIconized
}
} // end of wxTopLevelWindowOS2::SetIcon
-bool wxTopLevelWindowOS2::EnableCloseButton(
- bool bEnable
-)
+bool wxTopLevelWindowOS2::EnableCloseButton( bool bEnable )
{
//
// Get system (a.k.a. window) menu
//
- HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU);
+ HMENU hMenu = ::WinWindowFromID(m_hFrame, FID_SYSMENU);
if (!hMenu)
{
wxLogLastError(_T("GetSystemMenu"));
- return FALSE;
+ return false;
}
//
,(MPARAM)FCF_MENU
,(MPARAM)0
);
- return TRUE;
+ return true;
} // end of wxTopLevelWindowOS2::EnableCloseButton
// ============================================================================
{
m_shWnd = NULL;
m_szClassName = NULL;
- return TRUE;
+ return true;
} // end of wxTLWHiddenParentModule::OnInit
void wxTLWHiddenParentModule::OnExit()
m_szClassName = zHIDDEN_PARENT_CLASS;
}
}
- m_shWnd = ::WinCreateWindow( HWND_DESKTOP
- ,(PSZ)m_szClassName
- ,""
- ,0L
- ,(LONG)0L
- ,(LONG)0L
- ,(LONG)0L
- ,(LONG)0L
- ,NULLHANDLE
- ,HWND_TOP
- ,0L
- ,NULL
- ,NULL
- );
+ m_shWnd = ::WinCreateWindow( HWND_DESKTOP,
+ (PSZ)m_szClassName,
+ "",
+ 0L,
+ (LONG)0L,
+ (LONG)0L,
+ (LONG)0L,
+ (LONG)0L,
+ NULLHANDLE,
+ HWND_TOP,
+ 0L,
+ NULL,
+ NULL );
if (!m_shWnd)
{
wxLogLastError(_T("CreateWindow(hidden TLW parent)"));
::WinSetWindowPos(GetHwnd(), HWND_BOTTOM, 0, 0, 0, 0, SWP_ZORDER | SWP_DEACTIVATE);
} // end of wxWindowOS2::Lower
-void wxWindowOS2::SetTitle( const wxString& rTitle )
+void wxWindowOS2::SetLabel( const wxString& label )
{
- ::WinSetWindowText(GetHwnd(), (PSZ)rTitle.c_str());
-} // end of wxWindowOS2::SetTitle
+ ::WinSetWindowText(GetHwnd(), (PSZ)label.c_str());
+} // end of wxWindowOS2::SetLabel
-wxString wxWindowOS2::GetTitle() const
+wxString wxWindowOS2::GetLabel() const
{
return wxGetWindowText(GetHWND());
-} // end of wxWindowOS2::GetTitle
+} // end of wxWindowOS2::GetLabel
void wxWindowOS2::DoCaptureMouse()
{
::WinSetCapture(HWND_DESKTOP, hWnd);
m_bWinCaptured = true;
}
-} // end of wxWindowOS2::GetTitle
+} // end of wxWindowOS2::DoCaptureMouse
void wxWindowOS2::DoReleaseMouse()
{
projects / wxWidgets.git / commitdiff
