win32cpp merge: changed all symbols cube & server. done.

This commit is contained in:
andre@woesten.com 2008-09-09 12:17:06 +00:00
parent b5b8aa7cef
commit 53073ffd66
6 changed files with 15 additions and 15 deletions

View File

@ -52,7 +52,7 @@
#include <win32cpp/Splitter.hpp>
#include <win32cpp/TabView.hpp>
#include <win32cpp/RedrawLock.hpp>
#include <win32cpp/SysTray.hpp>
#include <win32cpp/TrayIconManager.hpp>
//////////////////////////////////////////////////////////////////////////////

View File

@ -40,7 +40,7 @@
#include <cube/SettingsView.hpp>
#include <win32cpp/LinearLayout.hpp>
#include <win32cpp/Button.hpp>
#include <win32cpp/Checkbox.hpp>
#include <win32cpp/CheckBox.hpp>
#include <win32cpp/RadioButton.hpp>
#include <win32cpp/GroupBox.hpp>
#include <win32cpp/ListView.hpp>
@ -58,7 +58,7 @@ using namespace musik::cube;
}
void SettingsView::OnPressTestCheckbox(Checkbox* checkbox , int state)
void SettingsView::OnPressTestCheckbox(CheckBox* CheckBox , int state)
{
if(state == BST_CHECKED) {
::MessageBox(NULL, _T("checked"), _T("checked"), MB_OK);
@ -117,13 +117,13 @@ void SettingsView::OnCreated()
mainLayout->AddChild(new Frame(libraryStatusLayout,FramePadding(20,20,20,0)));
mainLayout->AddChild(new Frame(pathLayout,FramePadding(20,20,0,20)));
// test checkbox
Checkbox* c = new Checkbox(_T("Test 1"));
// test CheckBox
CheckBox* c = new CheckBox(_T("Test 1"));
mainLayout->AddChild(c);
c->Check();
c->Pressed.connect(this, &SettingsView::OnPressTestCheckbox);
Checkbox* c2 = new Checkbox(_T("Test 2"), BS_AUTO3STATE);
CheckBox* c2 = new CheckBox(_T("Test 2"), BS_AUTO3STATE);
mainLayout->AddChild(c2);
c2->SetIndeterminate();
c2->Pressed.connect(this, &SettingsView::OnPressTestCheckbox);
@ -157,9 +157,9 @@ void SettingsView::OnCreated()
// test groupbox
GroupBox* g = new GroupBox(_T("test group box"));
Checkbox* gc = new Checkbox(_T("Test Checkbox"));
Checkbox* gc2 = new Checkbox(_T("Test Checkbox2"));
Checkbox* gc3 = new Checkbox(_T("Test Checkbox2"));
CheckBox* gc = new CheckBox(_T("Test CheckBox"));
CheckBox* gc2 = new CheckBox(_T("Test CheckBox2"));
CheckBox* gc3 = new CheckBox(_T("Test CheckBox2"));
g->AddChild(gc);
g->AddChild(gc2);

View File

@ -47,7 +47,7 @@ namespace win32cpp{
//////////////////////////////////////////////////////////////////////////////
#include <win32cpp/Frame.hpp>
#include <win32cpp/Checkbox.hpp>
#include <win32cpp/CheckBox.hpp>
//////////////////////////////////////////////////////////////////////////////
@ -65,7 +65,7 @@ class SettingsView: public Frame
public: /*ctor*/ SettingsView();
protected:
virtual void OnPressTestCheckbox(Checkbox* checkbox , int state);
virtual void OnPressTestCheckbox(CheckBox* checkbox , int state);
virtual void OnCreated();
friend class SettingsController;
Button *addPathButton,*removePathButton;

View File

@ -53,7 +53,7 @@
#include <win32cpp/LinearLayout.hpp>
#include <win32cpp/Label.hpp>
#include <win32cpp/Frame.hpp>
#include <win32cpp/SysTray.hpp>
#include <win32cpp/TrayIconManager.hpp>
//////////////////////////////////////////////////////////////////////////////

View File

@ -41,7 +41,7 @@
#include <win32cpp/Win32Config.hpp>
#include <win32cpp/Types.hpp>
#include <win32cpp/TopLevelWindow.hpp>
#include <win32cpp/TrayIconManager.hpp>
//////////////////////////////////////////////////////////////////////////////
@ -86,7 +86,7 @@ public: // methods
const uistring& CommandLine() const;
int ShowCommand() const;
void Terminate() const;
TrayIconManager* SysTrayManager() const;
TrayIconManager* SysTrayManager() const;
ApplicationThread* Thread();
public: // operator overloads

View File

@ -45,8 +45,8 @@
#include <boost/scoped_ptr.hpp>
#include <win32cpp/Win32Config.hpp>
#include <win32cpp/Application.hpp>
#include <win32cpp/TrayIconManager.hpp>
#include <win32cpp/Application.hpp>
#include <win32cpp/TopLevelWindow.hpp>
#include <win32cpp/Container.hpp>
#include <win32cpp/Menu.hpp>