librunview/libsupport x86_gcc2 fixes
This commit is contained in:
parent
301e22bcb3
commit
f6a006dddc
|
@ -10,6 +10,7 @@
|
||||||
#include <String.h>
|
#include <String.h>
|
||||||
|
|
||||||
#include <libsupport/KeyMap.h>
|
#include <libsupport/KeyMap.h>
|
||||||
|
#include <libsupport/List.h>
|
||||||
|
|
||||||
class Conversation;
|
class Conversation;
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@
|
||||||
#include "ProtocolTemplate.h"
|
#include "ProtocolTemplate.h"
|
||||||
|
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <CheckBox.h>
|
#include <CheckBox.h>
|
||||||
#include <GroupLayoutBuilder.h>
|
#include <GroupLayoutBuilder.h>
|
||||||
|
|
|
@ -35,7 +35,8 @@
|
||||||
ConversationView::ConversationView()
|
ConversationView::ConversationView()
|
||||||
:
|
:
|
||||||
BGroupView("chatView", B_VERTICAL, B_USE_DEFAULT_SPACING),
|
BGroupView("chatView", B_VERTICAL, B_USE_DEFAULT_SPACING),
|
||||||
fMessageQueue()
|
fMessageQueue(),
|
||||||
|
fConversation(NULL)
|
||||||
{
|
{
|
||||||
fMessageCount = 0;
|
fMessageCount = 0;
|
||||||
_InitInterface();
|
_InitInterface();
|
||||||
|
@ -43,7 +44,13 @@ ConversationView::ConversationView()
|
||||||
|
|
||||||
|
|
||||||
ConversationView::ConversationView(Conversation* chat)
|
ConversationView::ConversationView(Conversation* chat)
|
||||||
: ConversationView()
|
:
|
||||||
|
#if defined(__i386__) && !defined(__x86_64__)
|
||||||
|
BGroupView("chatView", B_VERTICAL, B_USE_DEFAULT_SPACING),
|
||||||
|
fMessageQueue()
|
||||||
|
#else
|
||||||
|
ConversationView()
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
SetConversation(chat);
|
SetConversation(chat);
|
||||||
fUserList->SetConversation(chat);
|
fUserList->SetConversation(chat);
|
||||||
|
@ -211,6 +218,8 @@ ConversationView::GetConversation()
|
||||||
void
|
void
|
||||||
ConversationView::SetConversation(Conversation* chat)
|
ConversationView::SetConversation(Conversation* chat)
|
||||||
{
|
{
|
||||||
|
if (chat == NULL)
|
||||||
|
return;
|
||||||
fConversation = chat;
|
fConversation = chat;
|
||||||
fNameTextView->SetText(chat->GetName());
|
fNameTextView->SetText(chat->GetName());
|
||||||
fSubjectTextView->SetText(chat->GetSubject());
|
fSubjectTextView->SetText(chat->GetSubject());
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include "ConversationItem.h"
|
#include "ConversationItem.h"
|
||||||
#include "ConversationListView.h"
|
#include "ConversationListView.h"
|
||||||
#include "ConversationView.h"
|
#include "ConversationView.h"
|
||||||
#include "DefaultItems.h"
|
|
||||||
#include "EditingFilter.h"
|
#include "EditingFilter.h"
|
||||||
#include "MainWindow.h"
|
#include "MainWindow.h"
|
||||||
#include "NotifyMessage.h"
|
#include "NotifyMessage.h"
|
||||||
|
@ -343,8 +342,8 @@ void
|
||||||
MainWindow::SetConversation(Conversation* chat)
|
MainWindow::SetConversation(Conversation* chat)
|
||||||
{
|
{
|
||||||
// Save current size of chat and textbox
|
// Save current size of chat and textbox
|
||||||
float weightChat = fRightView->ItemWeight(0);
|
float weightChat = fRightView->ItemWeight((int32)0);
|
||||||
float weightSend = fRightView->ItemWeight(1);
|
float weightSend = fRightView->ItemWeight((int32)1);
|
||||||
|
|
||||||
fRightView->RemoveChild(fRightView->FindView("chatView"));
|
fRightView->RemoveChild(fRightView->FindView("chatView"));
|
||||||
fRightView->RemoveChild(fRightView->FindView("fSendScroll"));
|
fRightView->RemoveChild(fRightView->FindView("fSendScroll"));
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
#ifndef _Emoticor_h_
|
#ifndef _Emoticor_h_
|
||||||
#define _Emoticor_h_
|
#define _Emoticor_h_
|
||||||
|
|
||||||
|
|
||||||
#include <String.h>
|
#include <String.h>
|
||||||
#include "RunView.h"
|
#include <librunview/RunView.h>
|
||||||
#include "Emoconfig.h"
|
#include <librunview/Emoconfig.h>
|
||||||
|
|
||||||
|
|
||||||
class Emoticor
|
class Emoticor
|
||||||
{
|
{
|
||||||
|
|
|
@ -76,7 +76,7 @@ LIBPATHS =
|
||||||
# Additional paths to look for system headers. These use the form
|
# Additional paths to look for system headers. These use the form
|
||||||
# "#include <header>". Directories that contain the files in SRCS are
|
# "#include <header>". Directories that contain the files in SRCS are
|
||||||
# NOT auto-included here.
|
# NOT auto-included here.
|
||||||
SYSTEM_INCLUDE_PATHS =
|
SYSTEM_INCLUDE_PATHS = libs
|
||||||
|
|
||||||
# Additional paths paths to look for local headers. These use the form
|
# Additional paths paths to look for local headers. These use the form
|
||||||
# #include "header". Directories that contain the files in SRCS are
|
# #include "header". Directories that contain the files in SRCS are
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
#ifndef _SmileTextRender_H_
|
#ifndef _SmileTextRender_H_
|
||||||
#define _SmileTextRender_H_
|
#define _SmileTextRender_H_
|
||||||
|
|
||||||
#include "TextRender.h"
|
|
||||||
#include <Font.h>
|
#include <Font.h>
|
||||||
#include <View.h>
|
#include <View.h>
|
||||||
|
|
||||||
|
@ -10,7 +9,9 @@
|
||||||
#include <Resources.h>
|
#include <Resources.h>
|
||||||
#include <String.h>
|
#include <String.h>
|
||||||
|
|
||||||
#include "Emoticor.h"
|
#include <librunview/TextRender.h>
|
||||||
|
#include <librunview/Emoticor.h>
|
||||||
|
|
||||||
|
|
||||||
class SmileTextRender : public TextRender
|
class SmileTextRender : public TextRender
|
||||||
{
|
{
|
||||||
|
@ -34,6 +35,7 @@ public:
|
||||||
|
|
||||||
|
|
||||||
virtual float Size() {
|
virtual float Size() {
|
||||||
|
printf("GETTING EMOTICOR SIZE!!!!\n");
|
||||||
return Emoticor::Get()->Config()->GetEmoticonSize();
|
return Emoticor::Get()->Config()->GetEmoticonSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <GraphicsDefs.h>
|
#include <GraphicsDefs.h>
|
||||||
#include <List.h>
|
#include <List.h>
|
||||||
|
|
||||||
#include "TextRender.h"
|
#include <librunview/TextRender.h>
|
||||||
|
|
||||||
class BView;
|
class BView;
|
||||||
class NormalTextRender;
|
class NormalTextRender;
|
||||||
|
|
|
@ -26,8 +26,6 @@ public:
|
||||||
|
|
||||||
void AddList(KeyMap<KEY, TYPE> appendList);
|
void AddList(KeyMap<KEY, TYPE> appendList);
|
||||||
|
|
||||||
List<TYPE> Values() const;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::map<KEY, TYPE> fMap;
|
std::map<KEY, TYPE> fMap;
|
||||||
typedef typename std::map<KEY, TYPE>::iterator fIter;
|
typedef typename std::map<KEY, TYPE>::iterator fIter;
|
||||||
|
@ -127,16 +125,4 @@ KeyMap<KEY, TYPE>::AddList(KeyMap<KEY, TYPE> appendList)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
template<class KEY, class TYPE>
|
|
||||||
inline List<TYPE>
|
|
||||||
KeyMap<KEY, TYPE>::Values() const
|
|
||||||
{
|
|
||||||
List<TYPE> list;
|
|
||||||
|
|
||||||
for (fIter i = fMap.begin(); i != fMap.end(); ++i)
|
|
||||||
list.AddItem(i->second);
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // _KEY_MAP_H
|
#endif // _KEY_MAP_H
|
||||||
|
|
Ŝarĝante…
Reference in New Issue